Do not set a value to blockchain adapter URL field in public configuration (#730)

Author: jbern0rd

CHANGELOG.md

@@ -9,6 +9,10 @@ All notable changes to this project will be documented in this file.
 - Configuration server is now optional by default. (#728)
 - Improve switch statements after Java 17 migration. (#729)
 
+### Breaking API changes
+
+- Remove deprecated blockhainAdapterUrl field from PublicConfiguration. (#729)
+
 ### Dependency Upgrades
 
 - Upgrade to `eclipse-temurin:17.0.13_11-jre-focal`. (#728)

iexec-core-library/src/main/java/com/iexec/core/config/PublicConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,22 +22,14 @@
 import lombok.Value;
 
 /**
- * The {@link #blockchainAdapterUrl} and {@link #configServerUrl} fields are repetitive,
- * so if both are populated, they must contain the same value.
- * Duplicating these fields ensures worker/scheduler compatibility on different v8 versions.
- * In v9, the {@link #blockchainAdapterUrl} field will be removed.
+ * Configuration exposed by the scheduler and available publicly to all workers.
  */
 @Value
 @Builder
 @JsonDeserialize(builder = PublicConfiguration.PublicConfigurationBuilder.class)
 public class PublicConfiguration {
     String workerPoolAddress;
     String schedulerPublicAddress;
-    /**
-     * @deprecated Use {@link #configServerUrl} instead.
-     */
-    @Deprecated(forRemoval = true)
-    String blockchainAdapterUrl;
     String configServerUrl;
     String resultRepositoryURL;
     long askForReplicatePeriod;

iexec-core-library/src/test/java/com/iexec/core/config/PublicConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2023-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,48 +28,33 @@ class PublicConfigurationTests {
 
     @Test
     void shouldSerializeAndDeserialize() throws JsonProcessingException {
-        PublicConfiguration config = PublicConfiguration.builder().build();
-        String jsonString = mapper.writeValueAsString(config);
+        final PublicConfiguration config = PublicConfiguration.builder().build();
+        final String jsonString = mapper.writeValueAsString(config);
         assertThat(jsonString).isEqualTo("{\"workerPoolAddress\":null,\"schedulerPublicAddress\":null," +
-                "\"blockchainAdapterUrl\":null,\"configServerUrl\":null,\"resultRepositoryURL\":null," +
+                "\"configServerUrl\":null,\"resultRepositoryURL\":null," +
                 "\"askForReplicatePeriod\":0,\"requiredWorkerVersion\":null}");
-        PublicConfiguration parsedConfig = mapper.readValue(jsonString, PublicConfiguration.class);
+        final PublicConfiguration parsedConfig = mapper.readValue(jsonString, PublicConfiguration.class);
         assertThat(parsedConfig).isEqualTo(config);
     }
 
     @Test
-    void shouldDeserializeWhenBlockchainAdapterUrlIsPresentButConfigServerUrlNot() throws JsonProcessingException {
-
-        String jsonString = "{\"workerPoolAddress\":null,\"schedulerPublicAddress\":null," +
-                "\"blockchainAdapterUrl\":\"http://localhost:8080\",\"resultRepositoryURL\":null," +
-                "\"askForReplicatePeriod\":0,\"requiredWorkerVersion\":null}";
-
-        PublicConfiguration parsedConfig = mapper.readValue(jsonString, PublicConfiguration.class);
-        assertThat(parsedConfig.getBlockchainAdapterUrl()).isEqualTo("http://localhost:8080");
-        assertThat(parsedConfig.getConfigServerUrl()).isNull();
-    }
-
-    @Test
-    void shouldDeserializeWhenConfigServerUrlIsPresentButBlockchainAdapterUrlNot() throws JsonProcessingException {
-
-        String jsonString = "{\"workerPoolAddress\":null,\"schedulerPublicAddress\":null," +
-                "\"configServerUrl\":\"http://localhost:8080\",\"resultRepositoryURL\":null," +
+    void shouldDeserializeWhenConfigServerUrlIsMissing() throws JsonProcessingException {
+        final PublicConfiguration config = PublicConfiguration.builder().build();
+        final String jsonString = "{\"workerPoolAddress\":null,\"schedulerPublicAddress\":null," +
+                "\"resultRepositoryURL\":null," +
                 "\"askForReplicatePeriod\":0,\"requiredWorkerVersion\":null}";
-
-        PublicConfiguration parsedConfig = mapper.readValue(jsonString, PublicConfiguration.class);
-        assertThat(parsedConfig.getConfigServerUrl()).isEqualTo("http://localhost:8080");
-        assertThat(parsedConfig.getBlockchainAdapterUrl()).isNull();
+        final PublicConfiguration parsedConfig = mapper.readValue(jsonString, PublicConfiguration.class);
+        assertThat(parsedConfig).isEqualTo(config);
     }
 
     @Test
-    void shouldDeserializeWhenConfigServerUrlAndBlockchainAdapterUrlArePresent() throws JsonProcessingException {
-
-        String jsonString = "{\"workerPoolAddress\":null,\"schedulerPublicAddress\":null," +
-                "\"configServerUrl\":\"http://localhost:8080\",\"blockchainAdapterUrl\":\"http://localhost:8082\",\"resultRepositoryURL\":null," +
+    void shouldDeserializeWhenConfigServerUrlIsPresent() throws JsonProcessingException {
+        final PublicConfiguration config = PublicConfiguration.builder()
+                .configServerUrl("http://localhost:8888").build();
+        final String jsonString = "{\"workerPoolAddress\":null,\"schedulerPublicAddress\":null," +
+                "\"configServerUrl\":\"http://localhost:8888\",\"resultRepositoryURL\":null," +
                 "\"askForReplicatePeriod\":0,\"requiredWorkerVersion\":null}";
-
-        PublicConfiguration parsedConfig = mapper.readValue(jsonString, PublicConfiguration.class);
-        assertThat(parsedConfig.getConfigServerUrl()).isEqualTo("http://localhost:8080");
-        assertThat(parsedConfig.getBlockchainAdapterUrl()).isEqualTo("http://localhost:8082");
+        final PublicConfiguration parsedConfig = mapper.readValue(jsonString, PublicConfiguration.class);
+        assertThat(parsedConfig).isEqualTo(config);
     }
 }

src/main/java/com/iexec/core/configuration/PublicConfigurationService.java

@@ -61,7 +61,6 @@ public PublicConfigurationService(ChainConfig chainConfig,
     void buildPublicConfiguration() {
         this.publicConfiguration = PublicConfiguration.builder()
                 .workerPoolAddress(chainConfig.getPoolAddress())
-                .blockchainAdapterUrl(configServerClientConfig.getUrl())
                 .configServerUrl(configServerClientConfig.getUrl())
                 .schedulerPublicAddress(signerService.getAddress())
                 .resultRepositoryURL(resultRepoConfig.getResultRepositoryURL())