Fix order of parameters passed to priv_call method (hyperledger-web3j…

…#1185) https://besu.hyperledger.org/en/stable/Reference/API-Methods/#priv_call
FabianSchuessler · Apr 14, 2020 · bdf146e · bdf146e
1 parent c594443
commit bdf146e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/besu/src/main/java/org/web3j/protocol/besu/Besu.java b/besu/src/main/java/org/web3j/protocol/besu/Besu.java
@@ -110,7 +110,7 @@ Request<?, EthGetCode> privGetCode(
             String privacyGroupId, String address, DefaultBlockParameter defaultBlockParameter);
 
     Request<?, org.web3j.protocol.core.methods.response.EthCall> privCall(
+            String privacyGroupId,
             org.web3j.protocol.core.methods.request.Transaction transaction,
-            DefaultBlockParameter defaultBlockParameter,
-            String privacyGroupId);
+            DefaultBlockParameter defaultBlockParameter);
 }
diff --git a/besu/src/main/java/org/web3j/protocol/besu/JsonRpc2_0Besu.java b/besu/src/main/java/org/web3j/protocol/besu/JsonRpc2_0Besu.java
@@ -336,12 +336,12 @@ public Request<?, EthGetCode> privGetCode(
 
     @Override
     public Request<?, EthCall> privCall(
+            String privacyGroupId,
             final Transaction transaction,
-            final DefaultBlockParameter defaultBlockParameter,
-            String privacyGroupId) {
+            final DefaultBlockParameter defaultBlockParameter) {
         return new Request<>(
                 "priv_call",
-                Arrays.asList(transaction, defaultBlockParameter, privacyGroupId),
+                Arrays.asList(privacyGroupId, transaction, defaultBlockParameter),
                 web3jService,
                 org.web3j.protocol.core.methods.response.EthCall.class);
     }

diff --git a/besu/src/test/java/org/web3j/protocol/besu/RequestTest.java b/besu/src/test/java/org/web3j/protocol/besu/RequestTest.java
@@ -216,18 +216,18 @@ public void testPrivGetCode() throws Exception {
     @Test
     public void testEthCall() throws Exception {
         web3j.privCall(
+                        MOCK_PRIVACY_GROUP_ID.toString(),
                         Transaction.createEthCallTransaction(
                                 "0xa70e8dd61c5d32be8058bb8eb970870f07233155",
                                 "0xb60e8dd61c5d32be8058bb8eb970870f07233155",
                                 "0x0"),
-                        DefaultBlockParameter.valueOf("latest"),
-                        MOCK_PRIVACY_GROUP_ID.toString())
+                        DefaultBlockParameter.valueOf("latest"))
                 .send();
 
         verifyResult(
                 "{\"jsonrpc\":\"2.0\",\"method\":\"priv_call\","
-                        + "\"params\":[{\"from\":\"0xa70e8dd61c5d32be8058bb8eb970870f07233155\","
+                        + "\"params\":[\"DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=\",{\"from\":\"0xa70e8dd61c5d32be8058bb8eb970870f07233155\","
                         + "\"to\":\"0xb60e8dd61c5d32be8058bb8eb970870f07233155\",\"data\":\"0x0\"},"
-                        + "\"latest\",\"DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=\"],\"id\":1}");
+                        + "\"latest\"],\"id\":1}");
     }
 }