add permission blacklisted node apis and tests

web3j · Nov 12, 2019 · 477fd97 · 477fd97
1 parent 0dc83c8
commit 477fd97
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 0 deletions.
diff --git a/src/integration-test/java/org/web3j/quorum/RequestTest.java b/src/integration-test/java/org/web3j/quorum/RequestTest.java
@@ -517,4 +517,44 @@ public void testPermissionGetOrgDetails() throws Exception {
  verifyResult(
  "{\"jsonrpc\":\"2.0\",\"method\":\"quorumPermission_getOrgDetails\",\"params\":[\"orgId\"],\"id\":1}");
  }
+
+ @Test
+ public void testPermissionRecoverBlackListedNode() throws Exception {
+ web3j.quorumPermissionRecoverBlackListedNode(
+ "orgId",
+ "enodeId",
+ new PrivateTransaction(
+ "FROM",
+ BigInteger.ONE,
+ BigInteger.TEN,
+ "TO",
+ BigInteger.TEN,
+ "DATA",
+ "privateFrom",
+ Arrays.asList("privateFor1", "privateFor2")))
+ .send();
+
+ verifyResult(
+ "{\"jsonrpc\":\"2.0\",\"method\":\"quorumPermission_recoverBlackListedNode\",\"params\":[\"orgId\",\"enodeId\",{\"from\":\"FROM\",\"to\":\"TO\",\"gas\":\"0xa\",\"value\":\"0xa\",\"data\":\"0xDATA\",\"nonce\":\"0x1\",\"privateFrom\":\"privateFrom\",\"privateFor\":[\"privateFor1\",\"privateFor2\"]}],\"id\":1}");
+ }
+
+ @Test
+ public void testPermissionApproveBlackListedNodeRecover() throws Exception {
+ web3j.quorumPermissionApproveBlackListedNodeRecovery(
+ "orgId",
+ "enodeId",
+ new PrivateTransaction(
+ "FROM",
+ BigInteger.ONE,
+ BigInteger.TEN,
+ "TO",
+ BigInteger.TEN,
+ "DATA",
+ "privateFrom",
+ Arrays.asList("privateFor1", "privateFor2")))
+ .send();
+
+ verifyResult(
+ "{\"jsonrpc\":\"2.0\",\"method\":\"quorumPermission_approveBlackListedNodeRecovery\",\"params\":[\"orgId\",\"enodeId\",{\"from\":\"FROM\",\"to\":\"TO\",\"gas\":\"0xa\",\"value\":\"0xa\",\"data\":\"0xDATA\",\"nonce\":\"0x1\",\"privateFrom\":\"privateFrom\",\"privateFor\":[\"privateFor1\",\"privateFor2\"]}],\"id\":1}");
+ }
 }
diff --git a/src/main/java/org/web3j/quorum/JsonRpc2_0Quorum.java b/src/main/java/org/web3j/quorum/JsonRpc2_0Quorum.java
@@ -390,4 +390,24 @@ public Request<?, OrgDetailsInfo> quorumPermissionGetOrgDetails(String orgId) {
  web3jService,
  OrgDetailsInfo.class);
  }
+
+ @Override
+ public Request<?, ExecStatusInfo> quorumPermissionRecoverBlackListedNode(
+ String orgId, String enodeId, PrivateTransaction transaction) {
+ return new Request<>(
+ "quorumPermission_recoverBlackListedNode",
+ Arrays.asList(orgId, enodeId, transaction),
+ web3jService,
+ ExecStatusInfo.class);
+ }
+
+ @Override
+ public Request<?, ExecStatusInfo> quorumPermissionApproveBlackListedNodeRecovery(
+ String orgId, String enodeId, PrivateTransaction transaction) {
+ return new Request<>(
+ "quorumPermission_approveBlackListedNodeRecovery",
+ Arrays.asList(orgId, enodeId, transaction),
+ web3jService,
+ ExecStatusInfo.class);
+ }
 }
diff --git a/src/main/java/org/web3j/quorum/Quorum.java b/src/main/java/org/web3j/quorum/Quorum.java
@@ -137,4 +137,10 @@ Request<?, ExecStatusInfo> quorumPermissionUpdateAccountStatus(
  String orgId, String address, int status, PrivateTransaction transaction);
 
  Request<?, OrgDetailsInfo> quorumPermissionGetOrgDetails(String orgId);
+
+ Request<?, ExecStatusInfo> quorumPermissionRecoverBlackListedNode(
+ String orgId, String enodeId, PrivateTransaction transaction);
+
+ Request<?, ExecStatusInfo> quorumPermissionApproveBlackListedNodeRecovery(
+ String orgId, String enodeId, PrivateTransaction transaction);
 }