From 606c53ac13c657c76e050dd391ec89c68f90b99a Mon Sep 17 00:00:00 2001 From: Miguel Rojo Date: Fri, 19 Aug 2022 16:12:41 +0100 Subject: [PATCH] small refactor Signed-off-by: Miguel Rojo --- .../privacy/FlexiblePrivacyAcceptanceTestBase.java | 9 ++++----- .../multitenancy/FlexibleMultiTenancyAcceptanceTest.java | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTestBase.java index 520ea4535ab..9e4f1638dad 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTestBase.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTestBase.java @@ -82,8 +82,7 @@ protected String createFlexiblePrivacyGroup( final String commitmentHash = callGetParticipantsMethodAndReturnCommitmentHash(privacyGroupId, groupCreator, privateFrom); final PrivateTransactionReceipt expectedReceipt = - buildExpectedAddMemberTransactionReceipt( - privacyGroupId, groupCreator, addresses.toArray(new String[] {})); + buildExpectedAddMemberTransactionReceipt(privacyGroupId, groupCreator, addresses); for (final PrivacyNode member : members) { member.verify( @@ -106,7 +105,7 @@ protected String callGetParticipantsMethodAndReturnCommitmentHash( } protected PrivateTransactionReceipt buildExpectedAddMemberTransactionReceipt( - final String privacyGroupId, final PrivacyNode groupCreator, final String[] members) { + final String privacyGroupId, final PrivacyNode groupCreator, final List members) { return buildExpectedAddMemberTransactionReceipt( privacyGroupId, groupCreator, groupCreator.getEnclaveKey(), members); } @@ -115,7 +114,7 @@ protected PrivateTransactionReceipt buildExpectedAddMemberTransactionReceipt( final String privacyGroupId, final PrivacyNode groupCreator, final String privateFrom, - final String[] members) { + final List members) { final StringBuilder output = new StringBuilder(); // hex prefix @@ -128,7 +127,7 @@ protected PrivateTransactionReceipt buildExpectedAddMemberTransactionReceipt( new DynamicArray<>( DynamicBytes.class, Utils.typeMap( - Arrays.stream(members) + members.stream() .map(Bytes::fromBase64String) .map(Bytes::toArrayUnsafe) .collect(Collectors.toList()), diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/FlexibleMultiTenancyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/FlexibleMultiTenancyAcceptanceTest.java index aba6174d26e..da692f21ba1 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/FlexibleMultiTenancyAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/FlexibleMultiTenancyAcceptanceTest.java @@ -459,7 +459,7 @@ private String createFlexiblePrivacyGroup(final MultiTenancyPrivacyGroup group) privacyGroupId, groupCreatorNode, groupCreatorTenant); final PrivateTransactionReceipt expectedReceipt = buildExpectedAddMemberTransactionReceipt( - privacyGroupId, groupCreatorNode, groupCreatorTenant, members.toArray(new String[] {})); + privacyGroupId, groupCreatorNode, groupCreatorTenant, members); for (final MultiTenancyPrivacyNode mtpn : multiTenancyPrivacyNodes) { final PrivacyNode privacyNode = mtpn.getPrivacyNode();