vacp2p/status-linea-besu
1
0
Fork 0
mirror of https://github.com/vacp2p/status-linea-besu.git synced 2026-01-09 22:07:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

deprecation: replace calls to isEqualToComparingFieldByField (#3042)

Browse Source 
* replace isEqualToComparingFieldByField with usingRecursiveComparison().isEqualTo

Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>

* isEqualTo()

Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>

* revert ibft and qbft tests back to compareFieldByField

Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>

* revert tests back to compareFieldByField

Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
This commit is contained in:
Sally MacFarlane
2021-11-15 20:20:59 +10:00
committed by GitHub
parent 270a066ef1
commit c0b1316d7b
83 changed files with 297 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

12
besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
View File

@@ -460,7 +460,8 @@ public class BesuCommandTest extends CommandTestAbstract {
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 class BesuCommandTest extends CommandTestAbstract {
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 class BesuCommandTest extends CommandTestAbstract {
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 class BesuCommandTest extends CommandTestAbstract {
final PermissioningConfiguration config =
permissioningConfigurationArgumentCaptor.getValue().get();
assertThat(config.getLocalConfig().get())
.isEqualToComparingFieldByField(localPermissioningConfiguration);
.usingRecursiveComparison()
.isEqualTo(localPermissioningConfiguration);
assertThat(commandErrorOutput.toString()).isEmpty();
assertThat(commandOutput.toString()).isEmpty();

2
besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java
View File

@@ -61,7 +61,7 @@ public abstract class AbstractCLIOptionsTest<D, T extends CLIOptions<D>>
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();

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

@@ -140,7 +140,8 @@ public class BlockTimerTest {
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 class BlockTimerTest {
assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
.isEqualToComparingFieldByField(round);
.usingRecursiveComparison()
.isEqualTo(round);
}
@Test
@@ -198,7 +200,8 @@ public class BlockTimerTest {
assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
.isEqualToComparingFieldByField(round);
.usingRecursiveComparison()
.isEqualTo(round);
}
@Test

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

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

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

@@ -194,7 +194,7 @@ public class EnclaveTest {
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));

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

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

24
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java
View File

@@ -84,7 +84,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -107,7 +107,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -152,7 +152,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -174,7 +174,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -197,7 +197,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -219,7 +219,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -242,7 +242,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -264,7 +264,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -287,7 +287,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -310,7 +310,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -333,7 +333,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -354,7 +354,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

4
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java
View File

@@ -76,7 +76,7 @@ public class EthGetBlockByHashIntegrationTest {
final JsonRpcMethod method = ethGetBlockByHash();
final JsonRpcResponse actual = method.response(requestWithParams(ZERO_HASH, true));
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -196,7 +196,7 @@ public class EthGetBlockByHashIntegrationTest {
"0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", false);
final JsonRpcResponse actual = ethGetBlockByHash().response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

18
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java
View File

@@ -146,7 +146,7 @@ public class EthGetFilterChangesIntegrationTest {
final JsonRpcResponse expected = new JsonRpcErrorResponse(null, JsonRpcError.FILTER_NOT_FOUND);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -159,7 +159,7 @@ public class EthGetFilterChangesIntegrationTest {
final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);
@@ -177,7 +177,7 @@ public class EthGetFilterChangesIntegrationTest {
// We haven't added any transactions, so the list of pending transactions should be empty.
final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);
@@ -195,19 +195,19 @@ public class EthGetFilterChangesIntegrationTest {
// We haven't added any blocks, so the list of new blocks should be empty.
JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
final Block block = appendBlock(transaction);
// We've added one block, so there should be one new hash.
expected = new JsonRpcSuccessResponse(null, Lists.newArrayList(block.getHash().toString()));
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
// The queue should be flushed and return no results.
expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);
@@ -225,7 +225,7 @@ public class EthGetFilterChangesIntegrationTest {
// We haven't added any transactions, so the list of pending transactions should be empty.
JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
transactions.addRemoteTransaction(transaction);
@@ -233,12 +233,12 @@ public class EthGetFilterChangesIntegrationTest {
expected =
new JsonRpcSuccessResponse(null, Lists.newArrayList(String.valueOf(transaction.getHash())));
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
// The queue should be flushed and return no results.
expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);

2
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java
View File

@@ -106,6 +106,6 @@ public class EthGetUncleByBlockHashAndIndexIntegrationTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isInstanceOf(JsonRpcSuccessResponse.class);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
}

2
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java
View File

@@ -97,7 +97,7 @@ public class EthGetUncleByBlockNumberAndIndexIntegrationTest {
final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
private JsonRpcRequestContext getUncleByBlockNumberAndIndex() {

3
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java
View File

@@ -182,6 +182,7 @@ public class PrivGetPrivateTransactionIntegrationTest {
(PrivateTransactionLegacyResult) response.getResult();
assertThat(new PrivateTransactionLegacyResult(this.privateTransaction))
.isEqualToComparingFieldByField(result);
.usingRecursiveComparison()
.isEqualTo(result);
}
}

18
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java
View File

@@ -81,7 +81,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -103,7 +103,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -126,7 +126,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -148,7 +148,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -171,7 +171,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -194,7 +194,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -216,7 +216,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -239,7 +239,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -261,7 +261,7 @@ public class EthCallIntegrationTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

18
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java
View File

@@ -146,7 +146,7 @@ public class EthGetFilterChangesIntegrationTest {
final JsonRpcResponse expected = new JsonRpcErrorResponse(null, JsonRpcError.FILTER_NOT_FOUND);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -159,7 +159,7 @@ public class EthGetFilterChangesIntegrationTest {
final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);
@@ -177,7 +177,7 @@ public class EthGetFilterChangesIntegrationTest {
// We haven't added any transactions, so the list of pending transactions should be empty.
final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);
@@ -195,19 +195,19 @@ public class EthGetFilterChangesIntegrationTest {
// We haven't added any blocks, so the list of new blocks should be empty.
JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
final Block block = appendBlock(transaction);
// We've added one block, so there should be one new hash.
expected = new JsonRpcSuccessResponse(null, Lists.newArrayList(block.getHash().toString()));
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
// The queue should be flushed and return no results.
expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);
@@ -225,7 +225,7 @@ public class EthGetFilterChangesIntegrationTest {
// We haven't added any transactions, so the list of pending transactions should be empty.
JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
transactions.addRemoteTransaction(transaction);
@@ -233,12 +233,12 @@ public class EthGetFilterChangesIntegrationTest {
expected =
new JsonRpcSuccessResponse(null, Lists.newArrayList(String.valueOf(transaction.getHash())));
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
// The queue should be flushed and return no results.
expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByField(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
filterManager.uninstallFilter(filterId);

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java
View File

@@ -124,7 +124,7 @@ public class FilterManagerLogFilterTest {
final List<LogWithMetadata> retrievedLogs = filterManager.logsChanges(filterId);
assertThat(retrievedLogs).isEqualToComparingFieldByFieldRecursively(expectedLogs);
assertThat(retrievedLogs).usingRecursiveComparison().isEqualTo(expectedLogs);
}
@Test

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java
View File

@@ -57,7 +57,7 @@ public class FilterRepositoryTest {
final BlockFilter retrievedFilter = repository.getFilter("id", BlockFilter.class).get();
assertThat(retrievedFilter).isEqualToComparingFieldByField(filter);
assertThat(retrievedFilter).usingRecursiveComparison().isEqualTo(filter);
}
@Test
@@ -89,7 +89,7 @@ public class FilterRepositoryTest {
final Optional<BlockFilter> optional = repository.getFilter(filter.getId(), BlockFilter.class);
assertThat(optional.isPresent()).isTrue();
assertThat(optional.get()).isEqualToComparingFieldByField(filter);
assertThat(optional.get()).usingRecursiveComparison().isEqualTo(filter);
}
@Test

18
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java
View File

@@ -66,7 +66,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -78,7 +78,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -90,7 +90,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -103,7 +103,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -123,7 +123,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -135,7 +135,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(validRequest);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -149,7 +149,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -161,7 +161,7 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(validRequest);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -175,6 +175,6 @@ public class AdminAddPeerTest {
final JsonRpcResponse actualResponse = method.response(validRequest);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
}

12
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java
View File

@@ -60,7 +60,7 @@ public class AdminChangeLogLevelTest {
(JsonRpcSuccessResponse) adminChangeLogLevel.response(request);
final Level levelAfterJsonRpcRequest = LogManager.getLogger().getLevel();
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
assertThat(levelBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
assertThat(levelAfterJsonRpcRequest).isEqualByComparingTo(Level.DEBUG);
}
@@ -83,7 +83,7 @@ public class AdminChangeLogLevelTest {
final Level levelWithSpecificPackageAfterJsonRpcRequest =
LogManager.getLogger("com").getLevel();
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
assertThat(levelOfAllProjectBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
assertThat(levelOfAllProjectAfterJsonRpcRequest).isEqualByComparingTo(Level.INFO);
assertThat(levelWithSpecificPackageBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
@@ -103,7 +103,7 @@ public class AdminChangeLogLevelTest {
(JsonRpcSuccessResponse) adminChangeLogLevel.response(request);
final Level levelAfterJsonRpcRequest = LogManager.getLogger().getLevel();
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
assertThat(levelBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
assertThat(levelAfterJsonRpcRequest).isEqualByComparingTo(Level.DEBUG);
}
@@ -117,7 +117,7 @@ public class AdminChangeLogLevelTest {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -129,7 +129,7 @@ public class AdminChangeLogLevelTest {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -141,6 +141,6 @@ public class AdminChangeLogLevelTest {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
}

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java
View File

@@ -131,7 +131,7 @@ public class AdminLogsRemoveCacheTest {
final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
assertThat(fromBlock.getValue()).isEqualTo(expectedFromBlock);
assertThat(toBlock.getValue()).isEqualTo(expectedToBlock);
}
@@ -152,7 +152,7 @@ public class AdminLogsRemoveCacheTest {
final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test(expected = IllegalStateException.class)
@@ -180,6 +180,6 @@ public class AdminLogsRemoveCacheTest {
final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
}

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java
View File

@@ -68,7 +68,7 @@ public class AdminLogsRepairCacheTest {
final JsonRpcResponse actualResponse = adminLogsRepairCache.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -88,7 +88,7 @@ public class AdminLogsRepairCacheTest {
final JsonRpcResponse actualResponse = adminLogsRepairCache.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test(expected = IllegalStateException.class)

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java
View File

@@ -334,7 +334,7 @@ public class AdminNodeInfoTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -349,7 +349,7 @@ public class AdminNodeInfoTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@SuppressWarnings("unchecked")

5
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java
View File

@@ -76,7 +76,7 @@ public class AdminPeersTest {
final JsonRpcResponse response = adminPeers.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -104,7 +104,8 @@ public class AdminPeersTest {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.P2P_DISABLED);
Assertions.assertThat(adminPeers.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
private Collection<EthPeer> peerList() {

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java
View File

@@ -63,6 +63,6 @@ public class EthBlockNumberTest {
new JsonRpcSuccessResponse(request.getRequest().getId(), Quantity.create(headBlockNumber));
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
}

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java
View File

@@ -50,7 +50,7 @@ public class EthChainIdTest {
final JsonRpcResponse response = method.response(request());
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -60,7 +60,7 @@ public class EthChainIdTest {
final JsonRpcResponse response = method.response(request());
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext request() {

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java
View File

@@ -64,7 +64,7 @@ public class EthCoinbaseTest {
when(miningCoordinator.getCoinbase()).thenReturn(Optional.of(expectedAddress));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(miningCoordinator).getCoinbase();
verifyNoMoreInteractions(miningCoordinator);
}
@@ -77,7 +77,7 @@ public class EthCoinbaseTest {
when(miningCoordinator.getCoinbase()).thenReturn(Optional.empty());
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java
View File

@@ -89,7 +89,7 @@ public class EthGasPriceTest {
.thenAnswer(invocation -> createEmptyBlock(invocation.getArgument(0, Long.class)));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(miningCoordinator).getMinTransactionGasPrice();
verifyNoMoreInteractions(miningCoordinator);
@@ -111,7 +111,7 @@ public class EthGasPriceTest {
.thenAnswer(invocation -> createFakeBlock(invocation.getArgument(0, Long.class)));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verifyNoMoreInteractions(miningCoordinator);
@@ -132,7 +132,7 @@ public class EthGasPriceTest {
.thenAnswer(invocation -> createFakeBlock(invocation.getArgument(0, Long.class)));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verifyNoMoreInteractions(miningCoordinator);

14
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java
View File

@@ -100,7 +100,7 @@ public class EthGetFilterChangesTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(filterManager).blockChanges(eq("0x1"));
verify(filterManager).pendingTransactionChanges(eq("0x1"));
verify(filterManager).logsChanges(eq("0x1"));
@@ -117,7 +117,7 @@ public class EthGetFilterChangesTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -129,7 +129,7 @@ public class EthGetFilterChangesTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -144,7 +144,7 @@ public class EthGetFilterChangesTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -157,7 +157,7 @@ public class EthGetFilterChangesTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -172,7 +172,7 @@ public class EthGetFilterChangesTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -187,7 +187,7 @@ public class EthGetFilterChangesTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java
View File

@@ -96,7 +96,7 @@ public class EthGetFilterLogsTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -108,7 +108,7 @@ public class EthGetFilterLogsTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -120,7 +120,7 @@ public class EthGetFilterLogsTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithFilterId(final Object... filterId) {

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java
View File

@@ -126,7 +126,7 @@ public class EthGetUncleByBlockHashAndIndexTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -141,7 +141,7 @@ public class EthGetUncleByBlockHashAndIndexTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private BlockResult blockResult(final BlockHeader header) {

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java
View File

@@ -102,7 +102,7 @@ public class EthGetUncleByBlockNumberAndIndexTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test

8
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java
View File

@@ -77,7 +77,7 @@ public class EthGetWorkTest {
when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -101,7 +101,7 @@ public class EthGetWorkTest {
when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -128,7 +128,7 @@ public class EthGetWorkTest {
when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -139,7 +139,7 @@ public class EthGetWorkTest {
when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.empty());
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java
View File

@@ -57,7 +57,7 @@ public class EthHashrateTest {
when(miningCoordinator.hashesPerSecond()).thenReturn(Optional.of(12L));
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -68,7 +68,7 @@ public class EthHashrateTest {
when(miningCoordinator.hashesPerSecond()).thenReturn(Optional.empty());
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams() {

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java
View File

@@ -57,7 +57,7 @@ public class EthMiningTest {
when(miningCoordinator.isMining()).thenReturn(true);
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(miningCoordinator).isMining();
verifyNoMoreInteractions(miningCoordinator);
}
@@ -70,7 +70,7 @@ public class EthMiningTest {
when(miningCoordinator.isMining()).thenReturn(false);
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(miningCoordinator).isMining();
verifyNoMoreInteractions(miningCoordinator);
}

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java
View File

@@ -56,7 +56,7 @@ public class EthNewBlockFilterTest {
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(request.getRequest().getId(), "0x0");
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(filterManager).installBlockFilter();
verifyNoMoreInteractions(filterManager);
}

8
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java
View File

@@ -100,7 +100,7 @@ public class EthNewFilterTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(filterManager)
.installLogFilter(
refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));
@@ -119,7 +119,7 @@ public class EthNewFilterTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(filterManager)
.installLogFilter(
refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));
@@ -138,7 +138,7 @@ public class EthNewFilterTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(filterManager)
.installLogFilter(
refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));
@@ -159,7 +159,7 @@ public class EthNewFilterTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(filterManager)
.installLogFilter(
refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java
View File

@@ -49,7 +49,7 @@ public class EthProtocolVersionTest {
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(request.getRequest().getId(), "0x3f");
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -63,7 +63,7 @@ public class EthProtocolVersionTest {
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(request.getRequest().getId(), null);
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -77,7 +77,7 @@ public class EthProtocolVersionTest {
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(request.getRequest().getId(), "0x3f");
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

12
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java
View File

@@ -60,7 +60,7 @@ public class EthSendRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -73,7 +73,7 @@ public class EthSendRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -87,7 +87,7 @@ public class EthSendRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -103,7 +103,7 @@ public class EthSendRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -122,7 +122,7 @@ public class EthSendRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(transactionPool).addLocalTransaction(any(Transaction.class));
}
@@ -196,7 +196,7 @@ public class EthSendRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(transactionPool).addLocalTransaction(any(Transaction.class));
}

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java
View File

@@ -51,6 +51,6 @@ public class EthSendTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
}

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java
View File

@@ -66,7 +66,7 @@ public class EthSubmitWorkTest {
final JsonRpcResponse actualResponse = method.response(request);
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.NO_MINING_WORK_FOUND);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -112,7 +112,7 @@ public class EthSubmitWorkTest {
when(miningCoordinator.submitWork(expectedFirstOutput)).thenReturn(true);
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -123,7 +123,7 @@ public class EthSubmitWorkTest {
when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.empty());
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java
View File

@@ -63,7 +63,7 @@ public class EthSyncingTest {
when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus);
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(synchronizer).getSyncStatus();
verifyNoMoreInteractions(synchronizer);
}
@@ -80,7 +80,7 @@ public class EthSyncingTest {
when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus);
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(synchronizer).getSyncStatus();
verifyNoMoreInteractions(synchronizer);
}
@@ -97,7 +97,7 @@ public class EthSyncingTest {
when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus);
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(synchronizer).getSyncStatus();
verifyNoMoreInteractions(synchronizer);
}

9
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java
View File

@@ -81,7 +81,8 @@ public class NetEnodeTest {
new JsonRpcSuccessResponse(request.getRequest().getId(), enodeURL.get().toString());
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
@Test
@@ -93,7 +94,8 @@ public class NetEnodeTest {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.P2P_DISABLED);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
@Test
@@ -107,7 +109,8 @@ public class NetEnodeTest {
request.getRequest().getId(), JsonRpcError.P2P_NETWORK_NOT_RUNNING);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
private JsonRpcRequestContext netEnodeRequest() {

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java
View File

@@ -52,7 +52,8 @@ public class NetListeningTest {
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, true);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
@Test
@@ -63,7 +64,8 @@ public class NetListeningTest {
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, false);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
@Test

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java
View File

@@ -49,7 +49,7 @@ public class NetVersionTest {
final JsonRpcResponse response = method.response(request());
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -59,7 +59,7 @@ public class NetVersionTest {
final JsonRpcResponse response = method.response(request());
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext request() {

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java
View File

@@ -54,6 +54,6 @@ public class RpcModulesTest {
new JsonRpcSuccessResponse(request.getRequest().getId(), ImmutableMap.of("debug", "1.0"));
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
}

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java
View File

@@ -46,6 +46,6 @@ public class Web3ClientVersionTest {
new JsonRpcSuccessResponse(request.getRequest().getId(), CLIENT_VERSION);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
}

16
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java
View File

@@ -46,7 +46,7 @@ public class Web3Sha3Test {
"0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad");
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -60,7 +60,7 @@ public class Web3Sha3Test {
"0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -73,7 +73,7 @@ public class Web3Sha3Test {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -86,7 +86,7 @@ public class Web3Sha3Test {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -99,7 +99,7 @@ public class Web3Sha3Test {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -112,7 +112,7 @@ public class Web3Sha3Test {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -126,7 +126,7 @@ public class Web3Sha3Test {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -138,6 +138,6 @@ public class Web3Sha3Test {
new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
}

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java
View File

@@ -82,7 +82,7 @@ public class MinerSetCoinbaseTest {
final JsonRpcResponse response = method.response(request);
verify(miningCoordinator).setCoinbase(eq(Address.fromHexString("0x0")));
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -99,7 +99,7 @@ public class MinerSetCoinbaseTest {
.setCoinbase(any());
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext minerSetCoinbaseRequest(final String hexString) {

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java
View File

@@ -59,6 +59,6 @@ public class MinerSetEtherbaseTest {
method.response(request);
final JsonRpcRequestContext delegatedRequest = requestCaptor.getValue();
assertThat(delegatedRequest).isEqualToComparingFieldByField(request);
assertThat(delegatedRequest).usingRecursiveComparison().isEqualTo(request);
}
}

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java
View File

@@ -58,7 +58,7 @@ public class MinerStartTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -69,7 +69,7 @@ public class MinerStartTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -82,7 +82,7 @@ public class MinerStartTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext minerStart() {

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java
View File

@@ -54,7 +54,7 @@ public class MinerStopTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -65,7 +65,7 @@ public class MinerStopTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonRpcRequestContext minerStop() {

10
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java
View File

@@ -64,7 +64,7 @@ public class PermAddAccountsToAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(accounts));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -76,7 +76,7 @@ public class PermAddAccountsToAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -88,7 +88,7 @@ public class PermAddAccountsToAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -100,7 +100,7 @@ public class PermAddAccountsToAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -113,7 +113,7 @@ public class PermAddAccountsToAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test

10
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java
View File

@@ -65,7 +65,7 @@ public class PermAddAccountsToWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(accounts));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -77,7 +77,7 @@ public class PermAddAccountsToWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -89,7 +89,7 @@ public class PermAddAccountsToWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -101,7 +101,7 @@ public class PermAddAccountsToWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -114,7 +114,7 @@ public class PermAddAccountsToWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test

17
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java
View File

@@ -83,7 +83,7 @@ public class PermAddNodesToAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -99,7 +99,7 @@ public class PermAddNodesToAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -114,7 +114,7 @@ public class PermAddNodesToAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -129,7 +129,7 @@ public class PermAddNodesToAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -144,7 +144,7 @@ public class PermAddNodesToAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -157,7 +157,7 @@ public class PermAddNodesToAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -173,7 +173,7 @@ public class PermAddNodesToAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -190,7 +190,8 @@ public class PermAddNodesToAllowlistTest {
request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
private JsonRpcRequestContext buildRequest(final List<String> enodeList) {

17
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java
View File

@@ -84,7 +84,7 @@ public class PermAddNodesToWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -100,7 +100,7 @@ public class PermAddNodesToWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -115,7 +115,7 @@ public class PermAddNodesToWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -130,7 +130,7 @@ public class PermAddNodesToWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -145,7 +145,7 @@ public class PermAddNodesToWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -158,7 +158,7 @@ public class PermAddNodesToWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -174,7 +174,7 @@ public class PermAddNodesToWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -191,7 +191,8 @@ public class PermAddNodesToWhitelistTest {
request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
private JsonRpcRequestContext buildRequest(final List<String> enodeList) {

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java
View File

@@ -60,7 +60,7 @@ public class PermGetAccountsAllowlistTest {
JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -71,6 +71,6 @@ public class PermGetAccountsAllowlistTest {
JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
}

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java
View File

@@ -61,7 +61,7 @@ public class PermGetAccountsWhitelistTest {
JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -72,6 +72,6 @@ public class PermGetAccountsWhitelistTest {
JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
}

7
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java
View File

@@ -76,7 +76,7 @@ public class PermGetNodesAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -92,7 +92,7 @@ public class PermGetNodesAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -108,7 +108,8 @@ public class PermGetNodesAllowlistTest {
request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
private JsonRpcRequestContext buildRequest() {

7
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java
View File

@@ -77,7 +77,7 @@ public class PermGetNodesWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -93,7 +93,7 @@ public class PermGetNodesWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -109,7 +109,8 @@ public class PermGetNodesWhitelistTest {
request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
private JsonRpcRequestContext buildRequest() {

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java
View File

@@ -64,7 +64,7 @@ public class PermReloadPermissionsFromFileTest {
JsonRpcResponse response = method.response(reloadRequest());
assertThat(response).isEqualToComparingFieldByField(expectedErrorResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedErrorResponse);
}
@Test
@@ -74,7 +74,7 @@ public class PermReloadPermissionsFromFileTest {
verify(accountLocalConfigPermissioningController).reload();
verify(nodeLocalConfigPermissioningController).reload();
assertThat(response).isEqualToComparingFieldByField(successResponse());
assertThat(response).usingRecursiveComparison().isEqualTo(successResponse());
}
@Test
@@ -85,7 +85,7 @@ public class PermReloadPermissionsFromFileTest {
JsonRpcResponse response = method.response(reloadRequest());
assertThat(response).isEqualToComparingFieldByField(expectedErrorResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedErrorResponse);
}
private JsonRpcSuccessResponse successResponse() {

10
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java
View File

@@ -65,7 +65,7 @@ public class PermRemoveAccountsFromAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(accounts));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -77,7 +77,7 @@ public class PermRemoveAccountsFromAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -89,7 +89,7 @@ public class PermRemoveAccountsFromAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -101,7 +101,7 @@ public class PermRemoveAccountsFromAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -114,7 +114,7 @@ public class PermRemoveAccountsFromAllowlistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test

10
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java
View File

@@ -66,7 +66,7 @@ public class PermRemoveAccountsFromWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(accounts));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -78,7 +78,7 @@ public class PermRemoveAccountsFromWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -90,7 +90,7 @@ public class PermRemoveAccountsFromWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -102,7 +102,7 @@ public class PermRemoveAccountsFromWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test
@@ -115,7 +115,7 @@ public class PermRemoveAccountsFromWhitelistTest {
JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
@Test

17
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java
View File

@@ -82,7 +82,7 @@ public class PermRemoveNodesFromAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -97,7 +97,7 @@ public class PermRemoveNodesFromAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -110,7 +110,7 @@ public class PermRemoveNodesFromAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -126,7 +126,7 @@ public class PermRemoveNodesFromAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -141,7 +141,8 @@ public class PermRemoveNodesFromAllowlistTest {
request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
@Test
@@ -156,7 +157,7 @@ public class PermRemoveNodesFromAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -171,7 +172,7 @@ public class PermRemoveNodesFromAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -187,7 +188,7 @@ public class PermRemoveNodesFromAllowlistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
private JsonRpcRequestContext buildRequest(final List<String> enodeList) {

17
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java
View File

@@ -83,7 +83,7 @@ public class PermRemoveNodesFromWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -98,7 +98,7 @@ public class PermRemoveNodesFromWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -111,7 +111,7 @@ public class PermRemoveNodesFromWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -127,7 +127,7 @@ public class PermRemoveNodesFromWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -142,7 +142,8 @@ public class PermRemoveNodesFromWhitelistTest {
request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
.usingRecursiveComparison()
.isEqualTo(expectedResponse);
}
@Test
@@ -157,7 +158,7 @@ public class PermRemoveNodesFromWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -172,7 +173,7 @@ public class PermRemoveNodesFromWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
@Test
@@ -188,7 +189,7 @@ public class PermRemoveNodesFromWhitelistTest {
final JsonRpcResponse actual = method.response(request);
assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
}
private JsonRpcRequestContext buildRequest(final List<String> enodeList) {

24
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java
View File

@@ -59,8 +59,7 @@ public class FilterParameterTest {
final FilterParameter parsedFilterParameter =
request.getRequiredParameter(0, FilterParameter.class);
assertThat(parsedFilterParameter)
.isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
}
@Test
@@ -74,8 +73,7 @@ public class FilterParameterTest {
final FilterParameter parsedFilterParameter =
request.getRequiredParameter(0, FilterParameter.class);
assertThat(parsedFilterParameter)
.isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
}
@Test
@@ -94,8 +92,7 @@ public class FilterParameterTest {
final FilterParameter parsedFilterParameter =
request.getRequiredParameter(0, FilterParameter.class);
assertThat(parsedFilterParameter)
.isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
}
@Test
@@ -114,8 +111,7 @@ public class FilterParameterTest {
final FilterParameter parsedFilterParameter =
request.getRequiredParameter(0, FilterParameter.class);
assertThat(parsedFilterParameter)
.isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
}
@Test
@@ -137,8 +133,7 @@ public class FilterParameterTest {
final FilterParameter parsedFilterParameter =
request.getRequiredParameter(0, FilterParameter.class);
assertThat(parsedFilterParameter)
.isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
}
@Test
@@ -195,7 +190,8 @@ public class FilterParameterTest {
assertThat(parsedFilterParameterUsingAlias.isValid()).isFalse();
assertThat(parsedFilterParameter)
.isEqualToComparingFieldByField(parsedFilterParameterUsingAlias);
.usingRecursiveComparison()
.isEqualTo(parsedFilterParameterUsingAlias);
}
@Test
@@ -236,7 +232,8 @@ public class FilterParameterTest {
// blockhash and blockHash should end up the same
assertThat(parsedFilterParameter)
.isEqualToComparingFieldByField(parsedFilterParameterUsingAlias);
.usingRecursiveComparison()
.isEqualTo(parsedFilterParameterUsingAlias);
}
@Test
@@ -248,7 +245,8 @@ public class FilterParameterTest {
"{\"address\":\"0x8CdaF0CD259887258Bc13a92C0a6dA92698644C0\",\"fromBlock\":\"earliest\",\"toBlock\":\"latest\",\"topics\":[\"0x492e34c7da2a87c57444aa0f6143558999bceec63065f04557cfb20932e0d591\"]}";
assertThat(readJsonAsFilterParameter(jsonWithTopicsFirst))
.isEqualToComparingFieldByFieldRecursively(readJsonAsFilterParameter(jsonWithTopicsLast));
.usingRecursiveComparison()
.isEqualTo(readJsonAsFilterParameter(jsonWithTopicsLast));
}
@Test

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/goquorum/GoQuorumSendRawPrivateTransactionTest.java
View File

@@ -158,7 +158,7 @@ public class GoQuorumSendRawPrivateTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verifyNoInteractions(transactionPool);
}
@@ -223,7 +223,7 @@ public class GoQuorumSendRawPrivateTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(transactionPool).addLocalTransaction(any(Transaction.class));
}

6
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java
View File

@@ -103,7 +103,7 @@ public class PrivCallTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(privacyController).simulatePrivateTransaction(any(), any(), any(), anyLong());
}
@@ -120,7 +120,7 @@ public class PrivCallTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(privacyController)
.simulatePrivateTransaction(any(), any(), eq(callParameter), anyLong());
}
@@ -134,7 +134,7 @@ public class PrivCallTest {
final JsonRpcResponse response = method.response(request);
assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(privacyController)
.simulatePrivateTransaction(any(), any(), eq(callParameter()), anyLong());
}

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java
View File

@@ -94,7 +94,7 @@ public class PrivDistributeRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(privacyController)
.createPrivateMarkerTransactionPayload(
any(PrivateTransaction.class), eq(ENCLAVE_PUBLIC_KEY), any());
@@ -123,6 +123,6 @@ public class PrivDistributeRawTransactionTest {
final JsonRpcResponse actualResponse = method.response(request);
assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
}
}

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java
View File

@@ -87,7 +87,7 @@ public class PrivFindPrivacyGroupTest {
(JsonRpcSuccessResponse) privFindPrivacyGroup.response(request);
final List<PrivacyGroup> result = (List<PrivacyGroup>) response.getResult();
assertThat(result).hasSize(1);
assertThat(result.get(0)).isEqualToComparingFieldByField(privacyGroup);
assertThat(result.get(0)).usingRecursiveComparison().isEqualTo(privacyGroup);
verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
}

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java
View File

@@ -85,7 +85,7 @@ public class PrivGetPrivateTransactionTest {
final JsonRpcRequestContext request = createRequestContext();
final PrivateTransactionResult result = makeRequest(request);
assertThat(result).isEqualToComparingFieldByField(expectedResult);
assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
}
@Test
@@ -104,7 +104,7 @@ public class PrivGetPrivateTransactionTest {
final JsonRpcRequestContext request = createRequestContext();
final PrivateTransactionResult result = makeRequest(request);
assertThat(result).isEqualToComparingFieldByField(expectedResult);
assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
}
@Test

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java
View File

@@ -100,7 +100,7 @@ public class PrivGetTransactionReceiptTest {
final PrivateTransactionReceiptResult result =
(PrivateTransactionReceiptResult) response.getResult();
assertThat(result).isEqualToComparingFieldByField(expectedResult);
assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
}
@Test
@@ -121,7 +121,7 @@ public class PrivGetTransactionReceiptTest {
final PrivateTransactionReceiptResult result =
(PrivateTransactionReceiptResult) response.getResult();
assertThat(result).isEqualToComparingFieldByField(expectedResult);
assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
}
@Test

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroupTest.java
View File

@@ -89,7 +89,7 @@ public class PrivxFindOnchainPrivacyGroupTest {
(JsonRpcSuccessResponse) privxFindOnchainPrivacyGroup.response(request);
final List<PrivacyGroup> result = (List<PrivacyGroup>) response.getResult();
assertThat(result).hasSize(1);
assertThat(result.get(0)).isEqualToComparingFieldByField(privacyGroup);
assertThat(result.get(0)).usingRecursiveComparison().isEqualTo(privacyGroup);
verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
}

10
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java
View File

@@ -53,7 +53,7 @@ public class SubscriptionBuilderTest {
final Subscription builtSubscription =
subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
}
@Test
@@ -76,7 +76,7 @@ public class SubscriptionBuilderTest {
final Subscription builtSubscription =
subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
}
@Test
@@ -89,7 +89,7 @@ public class SubscriptionBuilderTest {
final Subscription builtSubscription =
subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
}
@Test
@@ -102,7 +102,7 @@ public class SubscriptionBuilderTest {
final Subscription builtSubscription =
subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
}
@Test
@@ -115,7 +115,7 @@ public class SubscriptionBuilderTest {
final Subscription builtSubscription =
subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
}
@Test

15
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java
View File

@@ -189,8 +189,7 @@ public class SubscriptionRequestMapperTest {
final SubscribeRequest subscribeRequest =
mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
assertThat(subscribeRequest)
.isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
}
@Test
@@ -225,8 +224,7 @@ public class SubscriptionRequestMapperTest {
final SubscribeRequest subscribeRequest =
mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
assertThat(subscribeRequest)
.isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
}
@Test
@@ -260,8 +258,7 @@ public class SubscriptionRequestMapperTest {
final SubscribeRequest subscribeRequest =
mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
assertThat(subscribeRequest)
.isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
}
@Test
@@ -289,8 +286,7 @@ public class SubscriptionRequestMapperTest {
final SubscribeRequest subscribeRequest =
mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
assertThat(subscribeRequest)
.isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
}
@Test
@@ -419,8 +415,7 @@ public class SubscriptionRequestMapperTest {
mapper.mapPrivateSubscribeRequest(
new JsonRpcRequestContext(jsonRpcRequest), ENCLAVE_PUBLIC_KEY);
assertThat(subscribeRequest)
.isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
}
@Test

3
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java
View File

@@ -88,7 +88,8 @@ public class MainnetTransactionProcessorTest {
ImmutableTransactionValidationParams.builder().build());
assertThat(txValidationParamCaptor.getValue())
.isEqualToComparingFieldByField(expectedValidationParams);
.usingRecursiveComparison()
.isEqualTo(expectedValidationParams);
}
private ArgumentCaptor<TransactionValidationParams> transactionValidationParamCaptor() {

4
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java
View File

@@ -159,7 +159,7 @@ public class MultiTenancyPrivacyControllerTest {
final PrivacyGroup privacyGroup =
multiTenancyPrivacyController.createPrivacyGroup(
addresses, "name", "description", ENCLAVE_PUBLIC_KEY1);
assertThat(privacyGroup).isEqualToComparingFieldByField(delegatePrivacyGroup);
assertThat(privacyGroup).usingRecursiveComparison().isEqualTo(delegatePrivacyGroup);
verify(privacyController)
.createPrivacyGroup(addresses, "name", "description", ENCLAVE_PUBLIC_KEY1);
}
@@ -208,7 +208,7 @@ public class MultiTenancyPrivacyControllerTest {
final PrivacyGroup[] privacyGroups =
multiTenancyPrivacyController.findPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1);
assertThat(privacyGroups).hasSize(1);
assertThat(privacyGroups[0]).isEqualToComparingFieldByField(privacyGroup);
assertThat(privacyGroups[0]).usingRecursiveComparison().isEqualTo(privacyGroup);
verify(privacyController).findPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1);
}

4
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyControllerTest.java
View File

@@ -204,7 +204,7 @@ public class OnchainPrivacyControllerTest {
final List<PrivacyGroup> privacyGroups =
List.of(privacyController.findPrivacyGroupByMembers(PRIVACY_GROUP_ADDRESSES, ADDRESS1));
assertThat(privacyGroups).hasSize(1);
assertThat(privacyGroups.get(0)).isEqualToComparingFieldByField(EXPECTED_PRIVACY_GROUP);
assertThat(privacyGroups.get(0)).usingRecursiveComparison().isEqualTo(EXPECTED_PRIVACY_GROUP);
verify(privateStateStorage).getPrivacyGroupHeadBlockMap(any());
verify(privateTransactionSimulator).process(any(), any());
}
@@ -294,7 +294,7 @@ public class OnchainPrivacyControllerTest {
final Optional<PrivacyGroup> privacyGroupFound =
privacyController.findPrivacyGroupByGroupId(PRIVACY_GROUP_ID, ADDRESS1);
assertThat(privacyGroupFound).isPresent();
assertThat(privacyGroupFound.get()).isEqualToComparingFieldByField(privacyGroup);
assertThat(privacyGroupFound.get()).usingRecursiveComparison().isEqualTo(privacyGroup);
}
@Test

4
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java
View File

@@ -201,7 +201,7 @@ public class RestrictedDefaultPrivacyControllerTest {
PRIVACY_GROUP_DESCRIPTION,
ENCLAVE_PUBLIC_KEY);
assertThat(privacyGroup).isEqualToComparingFieldByField(enclavePrivacyGroupResponse);
assertThat(privacyGroup).usingRecursiveComparison().isEqualTo(enclavePrivacyGroupResponse);
verify(enclave)
.createPrivacyGroup(
PRIVACY_GROUP_ADDRESSES,
@@ -235,7 +235,7 @@ public class RestrictedDefaultPrivacyControllerTest {
final PrivacyGroup[] privacyGroups =
privacyController.findPrivacyGroupByMembers(PRIVACY_GROUP_ADDRESSES, ENCLAVE_PUBLIC_KEY);
assertThat(privacyGroups).hasSize(1);
assertThat(privacyGroups[0]).isEqualToComparingFieldByField(privacyGroup);
assertThat(privacyGroups[0]).usingRecursiveComparison().isEqualTo(privacyGroup);
verify(enclave).findPrivacyGroup(PRIVACY_GROUP_ADDRESSES);
}

3
ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java
View File

@@ -681,7 +681,8 @@ public class TransactionPoolTest {
transactionPool.addLocalTransaction(transaction1);
assertThat(txValidationParamCaptor.getValue())
.isEqualToComparingFieldByField(expectedValidationParams);
.usingRecursiveComparison()
.isEqualTo(expectedValidationParams);
}
@Test

6
nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java
View File

@@ -97,7 +97,7 @@ public final class DockerNatManagerTest {
p2pPort,
p2pPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
@Test
@@ -116,7 +116,7 @@ public final class DockerNatManagerTest {
rpcHttpPort,
rpcHttpPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
@Test
@@ -135,6 +135,6 @@ public final class DockerNatManagerTest {
p2pPort,
p2pPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
}

6
nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java
View File

@@ -114,7 +114,7 @@ public final class KubernetesClusterIpNatManagerTest {
p2pPort,
p2pPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
@Test
@@ -133,7 +133,7 @@ public final class KubernetesClusterIpNatManagerTest {
rpcHttpPort,
rpcHttpPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
@Test
@@ -152,6 +152,6 @@ public final class KubernetesClusterIpNatManagerTest {
p2pPort,
p2pPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
}

6
nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java
View File

@@ -123,7 +123,7 @@ public final class KubernetesLoadManagerNatManagerTest {
p2pPort,
p2pPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
@Test
@@ -142,7 +142,7 @@ public final class KubernetesLoadManagerNatManagerTest {
rpcHttpPort,
rpcHttpPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
@Test
@@ -161,6 +161,6 @@ public final class KubernetesLoadManagerNatManagerTest {
p2pPort,
p2pPort);
assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
}
}