Merge branch 'master' into PAN-3155/handle-discovery-peers-with-updat…

…ed-endpoints
hyperledger · Sep 17, 2019 · 29a0e7e · 29a0e7e
2 parents 6fe18b1 + e47edb5
commit 29a0e7e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java
@@ -14,9 +14,7 @@
 
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 
-import java.net.URI;
 import java.nio.file.Path;
-import java.util.Optional;
 
 public class BesuConfigurationImpl implements BesuConfiguration {
 
@@ -30,9 +28,4 @@ public BesuConfigurationImpl(final Path storagePath) {
   public Path getStoragePath() {
     return storagePath;
   }
-
-  @Override
-  public Optional<URI> getEnclaveUrl() {
-    return Optional.empty();
-  }
 }
diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle
@@ -56,7 +56,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'Qnc8VXZ1+kdpAlp2m+f5Kuxb1rwoxD74iBOGFpdDQ8Y='
+  knownHash = 'mBaqR6fbWYPndHOw7CymPkR3KKb+f8pxLldBnTCjYAg='
 }
 check.dependsOn('checkAPIChanges')
 

diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java
@@ -12,9 +12,7 @@
  */
 package org.hyperledger.besu.plugin.services;
 
-import java.net.URI;
 import java.nio.file.Path;
-import java.util.Optional;
 
 /** Generally useful configuration provided by Besu. */
 public interface BesuConfiguration {
@@ -25,12 +23,4 @@ public interface BesuConfiguration {
    * @return location of the storage in the file system of the client.
    */
   Path getStoragePath();
-
-  /**
-   * Url of the enclave that stores private transaction data.
-   *
-   * @return an optional containing the url of the enclave Besu is connected to, or empty if privacy
-   *     is not enabled.
-   */
-  Optional<URI> getEnclaveUrl();
 }