deprecation: replace calls to isEqualToComparingFieldByField

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java

@@ -38,6 +38,6 @@ public PrivGetPrivateTransactionSuccess(
   @Override
   public void verify(final Node node) {
     final PrivateTransactionGroupResponse result = node.execute(transaction);
-    assertThat(result).isEqualToComparingFieldByField(privateTransaction);
+    assertThat(result).usingRecursiveComparison().isEqualTo(privateTransaction);
   }
 }

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java

@@ -195,7 +195,7 @@ public void aliceCanUsePrivDistributeTransaction() {
         bobEnclave.receive(
             Bytes.fromHexString(transactionKey).toBase64String(), bob.getEnclaveKey());
 
-    assertThat(bobRR).isEqualToComparingFieldByField(aliceRR);
+    assertThat(bobRR).usingRecursiveComparison().isEqualTo(aliceRR);
 
     final RawTransaction pmt =
         RawTransaction.createTransaction(

besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java

@@ -460,7 +460,8 @@ public void nodePermissionsSmartContractMustUseOption() {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(smartContractPermissioningConfiguration);
+        .usingRecursiveComparison()
+        .isEqualTo(smartContractPermissioningConfiguration);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();
@@ -487,7 +488,8 @@ public void nodePermissionsContractVersionDefaultValue() {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(expectedConfig);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedConfig);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();
@@ -516,7 +518,8 @@ public void nodePermissionsContractVersionSetsValue() {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(expectedConfig);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedConfig);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();
@@ -718,7 +721,8 @@ public void nodePermissioningTomlPathMustUseOption() throws IOException {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getLocalConfig().get())
-        .isEqualToComparingFieldByField(localPermissioningConfiguration);
+        .usingRecursiveComparison()
+        .isEqualTo(localPermissioningConfiguration);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();

besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java

@@ -61,7 +61,7 @@ private void getCLIOptions(final D domainObject) {
     final TestBesuCommand cmd = parseCommand(cliOptions);
     final T optionsFromCommand = getOptionsFromBesuCommand(cmd);
 
-    assertThat(optionsFromCommand).isEqualToComparingFieldByField(options);
+    assertThat(optionsFromCommand).usingRecursiveComparison().isEqualTo(options);
 
     assertThat(commandOutput.toString()).isEmpty();
     assertThat(commandErrorOutput.toString()).isEmpty();

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BlockTimerTest.java

@@ -140,7 +140,8 @@ public void aBlockTimerExpiryEventIsAddedToTheQueueOnExpiry() throws Interrupted
     final BftEvent queuedEvent = eventQueue.poll(0, TimeUnit.SECONDS);
     assertThat(queuedEvent).isInstanceOf(BlockTimerExpiry.class);
     assertThat(((BlockTimerExpiry) queuedEvent).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test
@@ -169,7 +170,8 @@ public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsEqualToNow() {
 
     assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
     assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test
@@ -198,7 +200,8 @@ public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsInThePast() {
 
     assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
     assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java

@@ -75,7 +75,7 @@ public void testConversionFromVoteTypeToBoolean() {
 
     final JsonRpcResponse response = getMethod().response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test

consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java

@@ -210,6 +210,6 @@ private void verifyMessage(final MessageData actual, final BftMessage<?> expecte
         fail("Illegal IBFTV2 message type.");
         break;
     }
-    assertThat(expectedMessage).isEqualToComparingFieldByFieldRecursively(actualSignedPayload);
+    assertThat(expectedMessage).usingRecursiveComparison().isEqualTo(actualSignedPayload);
   }
 }

consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataEncoderTest.java

@@ -199,7 +199,7 @@ public void emptyVoteAndListIsEncodedCorrectly() {
     BftExtraData actualExtraData =
         ibftExtraDataEncoder.decodeRaw(ibftExtraDataEncoder.encode(expectedExtraData));
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test
@@ -255,7 +255,7 @@ public void emptyListsAreEncodedAndDecodedCorrectly() {
     BftExtraData actualExtraData =
         ibftExtraDataEncoder.decodeRaw(ibftExtraDataEncoder.encode(expectedExtraData));
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test
@@ -322,7 +322,7 @@ public void fullyPopulatedDataIsEncodedAndDecodedCorrectly() {
     final BftExtraData actualExtraData =
         ibftExtraDataEncoder.decodeRaw(ibftExtraDataEncoder.encode(expectedExtraData));
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test
@@ -340,7 +340,7 @@ public void decodingOfKnownRawHexStringMatchesKnowExtraDataObject() {
     Bytes rawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
     BftExtraData actualExtraData = bftExtraDataEncoder.decodeRaw(rawDecoding);
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test

consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java

@@ -85,7 +85,7 @@ public void discardValidator() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
 
     verify(voteProvider).discardVote(parameterAddress);
   }

consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java

@@ -104,7 +104,7 @@ public void addValidator() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
 
     verify(voteProvider).authVote(parameterAddress);
   }
@@ -118,7 +118,7 @@ public void removeValidator() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
 
     verify(voteProvider).dropVote(parameterAddress);
   }

consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java

@@ -43,7 +43,8 @@ public void roundTripRlp() {
         actualPreparePayload.getRoundIdentifier();
     final Hash actualDigest = actualPreparePayload.getDigest();
     assertThat(actualConsensusRoundIdentifier)
-        .isEqualToComparingFieldByField(expectedRoundIdentifier);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedRoundIdentifier);
     assertThat(actualDigest).isEqualTo(digest);
     assertThat(actualPreparePayload.getMessageType()).isEqualTo(IbftV2.PREPARE);
   }

consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/RoundSpecificPeers.java

@@ -216,6 +216,6 @@ private void verifyMessage(final MessageData actual, final BftMessage<?> expecte
         fail("Illegal QBFTV1 message type.");
         break;
     }
-    assertThat(expectedMessage).isEqualToComparingFieldByFieldRecursively(actualSignedPayload);
+    assertThat(expectedMessage).usingRecursiveComparison().isEqualTo(actualSignedPayload);
   }
 }

consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodecTest.java

@@ -199,7 +199,7 @@ public void emptyVoteAndListIsEncodedCorrectly() {
     BftExtraData actualExtraData =
         bftExtraDataCodec.decodeRaw(bftExtraDataCodec.encode(expectedExtraData));
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test
@@ -255,7 +255,7 @@ public void emptyListsAreEncodedAndDecodedCorrectly() {
     BftExtraData actualExtraData =
         bftExtraDataCodec.decodeRaw(bftExtraDataCodec.encode(expectedExtraData));
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test
@@ -321,7 +321,7 @@ public void fullyPopulatedDataIsEncodedAndDecodedCorrectly() {
     BftExtraData actualExtraData =
         bftExtraDataCodec.decodeRaw(bftExtraDataCodec.encode(expectedExtraData));
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test
@@ -338,7 +338,7 @@ public void decodingOfKnownRawHexStringMatchesKnowExtraDataObject() {
     Bytes rawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
     BftExtraData actualExtraData = bftExtraDataCodec.decodeRaw(rawDecoding);
 
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+    assertThat(actualExtraData).usingRecursiveComparison().isEqualTo(expectedExtraData);
   }
 
   @Test

consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/CommitTest.java

@@ -55,6 +55,7 @@ public void canRoundTripACommitMessage() {
     assertThat(decodedPrepare.getMessageType()).isEqualTo(QbftV1.COMMIT);
     assertThat(decodedPrepare.getAuthor()).isEqualTo(addr);
     assertThat(decodedPrepare.getSignedPayload())
-        .isEqualToComparingFieldByField(signedCommitPayload);
+        .usingRecursiveComparison()
+        .isEqualTo(signedCommitPayload);
   }
 }

consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/PrepareTest.java

@@ -48,6 +48,7 @@ public void canRoundTripAPrepareMessage() {
     assertThat(decodedPrepare.getMessageType()).isEqualTo(QbftV1.PREPARE);
     assertThat(decodedPrepare.getAuthor()).isEqualTo(addr);
     assertThat(decodedPrepare.getSignedPayload())
-        .isEqualToComparingFieldByField(signedPreparePayload);
+        .usingRecursiveComparison()
+        .isEqualTo(signedPreparePayload);
   }
 }

consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/ProposalTest.java

@@ -83,10 +83,11 @@ public void canRoundTripProposalMessage() {
     assertThat(decodedProposal.getAuthor()).isEqualTo(addr);
     assertThat(decodedProposal.getMessageType()).isEqualTo(QbftV1.PROPOSAL);
     assertThat(decodedProposal.getPrepares()).hasSize(1);
-    assertThat(decodedProposal.getPrepares().get(0)).isEqualToComparingFieldByField(prepare);
+    assertThat(decodedProposal.getPrepares().get(0)).usingRecursiveComparison().isEqualTo(prepare);
     assertThat(decodedProposal.getRoundChanges()).hasSize(1);
     assertThat(decodedProposal.getRoundChanges().get(0))
-        .isEqualToComparingFieldByField(roundChange);
+        .usingRecursiveComparison()
+        .isEqualTo(roundChange);
     assertThat(decodedProposal.getSignedPayload().getPayload().getProposedBlock()).isEqualTo(BLOCK);
     assertThat(decodedProposal.getSignedPayload().getPayload().getRoundIdentifier())
         .isEqualTo(payload.getRoundIdentifier());

consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/RoundChangeTest.java

@@ -81,12 +81,16 @@ public void canRoundTripARoundChangeMessage() {
     assertThat(decodedRoundChange.getMessageType()).isEqualTo(QbftV1.ROUND_CHANGE);
     assertThat(decodedRoundChange.getAuthor()).isEqualTo(addr);
     assertThat(decodedRoundChange.getSignedPayload())
-        .isEqualToComparingFieldByField(signedRoundChangePayload);
+        .usingRecursiveComparison()
+        .isEqualTo(signedRoundChangePayload);
     assertThat(decodedRoundChange.getProposedBlock()).isNotEmpty();
-    assertThat(decodedRoundChange.getProposedBlock().get()).isEqualToComparingFieldByField(BLOCK);
+    assertThat(decodedRoundChange.getProposedBlock().get())
+        .usingRecursiveComparison()
+        .isEqualTo(BLOCK);
     assertThat(decodedRoundChange.getPrepares()).hasSize(1);
     assertThat(decodedRoundChange.getPrepares().get(0))
-        .isEqualToComparingFieldByField(signedPreparePayload);
+        .usingRecursiveComparison()
+        .isEqualTo(signedPreparePayload);
   }
 
   @Test
@@ -109,7 +113,8 @@ public void canRoundTripEmptyPreparedRoundAndPreparedList() {
     assertThat(decodedRoundChange.getMessageType()).isEqualTo(QbftV1.ROUND_CHANGE);
     assertThat(decodedRoundChange.getAuthor()).isEqualTo(addr);
     assertThat(decodedRoundChange.getSignedPayload())
-        .isEqualToComparingFieldByField(signedRoundChangePayload);
+        .usingRecursiveComparison()
+        .isEqualTo(signedRoundChangePayload);
     assertThat(decodedRoundChange.getProposedBlock()).isEmpty();
     assertThat(decodedRoundChange.getPrepares()).isEmpty();
   }

enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java

@@ -194,7 +194,7 @@ public void testCreateDeleteRetrievePrivacyGroup() {
     final PrivacyGroup retrievePrivacyGroup =
         enclave.retrievePrivacyGroup(privacyGroupResponse.getPrivacyGroupId());
 
-    assertThat(retrievePrivacyGroup).isEqualToComparingFieldByField(privacyGroupResponse);
+    assertThat(retrievePrivacyGroup).usingRecursiveComparison().isEqualTo(privacyGroupResponse);
 
     final String response =
         enclave.deletePrivacyGroup(privacyGroupResponse.getPrivacyGroupId(), publicKeys.get(0));

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java

@@ -91,6 +91,6 @@ public void debugTraceTransactionMissingTest() {
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, null);
 
     final JsonRpcResponse response = method.response(request);
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }