Removing deprecated method (hyperledger#4741)

* Replace deprecated method * Ignore field Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
noirgif · Nov 28, 2022 · d5a1843 · d5a1843
1 parent d2382c6
commit d5a1843
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java
@@ -42,7 +42,10 @@ private void fromDomainObject(final D domainObject) {
 
     final List<String> fieldsToIgnore = getFieldsToIgnore();
     final String[] ignored = fieldsToIgnore.toArray(new String[0]);
-    assertThat(domainObjectFromOptions).isEqualToIgnoringGivenFields(domainObject, ignored);
+    assertThat(domainObjectFromOptions)
+        .usingRecursiveComparison()
+        .ignoringFields(ignored)
+        .isEqualTo(domainObject);
   }
 
   @Test
@@ -78,7 +81,10 @@ public void defaultValues() {
 
     // Check default values supplied by CLI match expected default values
     final String[] fieldsToIgnore = getFieldsWithComputedDefaults().toArray(new String[0]);
-    assertThat(optionsFromCommand).isEqualToIgnoringGivenFields(defaultOptions, fieldsToIgnore);
+    assertThat(optionsFromCommand)
+        .usingRecursiveComparison()
+        .ignoringFields(fieldsToIgnore)
+        .isEqualTo(defaultOptions);
   }
 
   abstract D createDefaultDomainObject();

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java
@@ -21,6 +21,9 @@
 import org.hyperledger.besu.cli.options.unstable.NetworkingOptions;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -212,4 +215,9 @@ NetworkingOptions optionsFromDomainObject(final NetworkingConfiguration domainOb
   NetworkingOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) {
     return besuCommand.getNetworkingOptions();
   }
+
+  @Override
+  protected List<String> getFieldsToIgnore() {
+    return Arrays.asList("rlpx.peerLowerBound");
+  }
 }