diff --git a/src/main/java/org/web3j/quorum/JsonRpc2_0Quorum.java b/src/main/java/org/web3j/quorum/JsonRpc2_0Quorum.java index a7f6a24..61c7a8b 100644 --- a/src/main/java/org/web3j/quorum/JsonRpc2_0Quorum.java +++ b/src/main/java/org/web3j/quorum/JsonRpc2_0Quorum.java @@ -239,30 +239,30 @@ public Request quorumPermissionGetRoleList() { @Override public Request quorumPermissionAddOrg( - String orgId, String url, String address, PrivateTransaction transaction) { + String orgId, String enodeId, String address, PrivateTransaction transaction) { return new Request<>( "quorumPermission_addOrg", - Arrays.asList(orgId, url, address, transaction), + Arrays.asList(orgId, enodeId, address, transaction), web3jService, ExecStatusInfo.class); } @Override public Request quorumPermissionApproveOrg( - String orgId, String url, String address, PrivateTransaction transaction) { + String orgId, String enodeId, String address, PrivateTransaction transaction) { return new Request<>( "quorumPermission_approveOrg", - Arrays.asList(orgId, url, address, transaction), + Arrays.asList(orgId, enodeId, address, transaction), web3jService, ExecStatusInfo.class); } @Override public Request quorumPermissionAddSubOrg( - String pOrgId, String orgId, String url, PrivateTransaction transaction) { + String pOrgId, String orgId, String enodeId, PrivateTransaction transaction) { return new Request<>( "quorumPermission_addSubOrg", - Arrays.asList(pOrgId, orgId, url, transaction), + Arrays.asList(pOrgId, orgId, enodeId, transaction), web3jService, ExecStatusInfo.class); } @@ -289,20 +289,20 @@ public Request quorumPermissionApproveOrgStatus( @Override public Request quorumPermissionAddNode( - String orgId, String url, PrivateTransaction transaction) { + String orgId, String enodeId, PrivateTransaction transaction) { return new Request<>( "quorumPermission_addNode", - Arrays.asList(orgId, url, transaction), + Arrays.asList(orgId, enodeId, transaction), web3jService, ExecStatusInfo.class); } @Override public Request quorumPermissionUpdateNodeStatus( - String orgId, String url, int action, PrivateTransaction transaction) { + String orgId, String enodeId, int action, PrivateTransaction transaction) { return new Request<>( "quorumPermission_updateNodeStatus", - Arrays.asList(orgId, url, action, transaction), + Arrays.asList(orgId, enodeId, action, transaction), web3jService, ExecStatusInfo.class); } @@ -383,11 +383,10 @@ public Request quorumPermissionUpdateAccountStatus( } @Override - public Request quorumPermissionGetOrgDetails( - String orgId, PrivateTransaction transaction) { + public Request quorumPermissionGetOrgDetails(String orgId) { return new Request<>( "quorumPermission_getOrgDetails", - Arrays.asList(orgId, transaction), + Collections.singletonList(orgId), web3jService, OrgDetailsInfo.class); } diff --git a/src/main/java/org/web3j/quorum/Quorum.java b/src/main/java/org/web3j/quorum/Quorum.java index 21784ed..7b381fa 100644 --- a/src/main/java/org/web3j/quorum/Quorum.java +++ b/src/main/java/org/web3j/quorum/Quorum.java @@ -90,13 +90,13 @@ Request ethSendRawPrivateTransaction( Request quorumPermissionGetAccountList(); Request quorumPermissionAddOrg( - String orgId, String url, String address, PrivateTransaction transaction); + String orgId, String enodeId, String address, PrivateTransaction transaction); Request quorumPermissionApproveOrg( - String orgId, String url, String address, PrivateTransaction transaction); + String orgId, String enodeId, String address, PrivateTransaction transaction); Request quorumPermissionAddSubOrg( - String pOrgId, String orgId, String url, PrivateTransaction transaction); + String pOrgId, String orgId, String enodeId, PrivateTransaction transaction); Request quorumPermissionUpdateOrgStatus( String orgId, int action, PrivateTransaction transaction); @@ -105,10 +105,10 @@ Request quorumPermissionApproveOrgStatus( String orgId, int action, PrivateTransaction transaction); Request quorumPermissionAddNode( - String orgId, String url, PrivateTransaction transaction); + String orgId, String enodeId, PrivateTransaction transaction); Request quorumPermissionUpdateNodeStatus( - String orgId, String url, int action, PrivateTransaction transaction); + String orgId, String enodeId, int action, PrivateTransaction transaction); Request quorumPermissionAssignAdminRole( String orgId, String address, String roleid, PrivateTransaction transaction); @@ -136,6 +136,5 @@ Request quorumPermissionChangeAccountRole( Request quorumPermissionUpdateAccountStatus( String orgId, String address, int status, PrivateTransaction transaction); - Request quorumPermissionGetOrgDetails( - String orgId, PrivateTransaction transaction); + Request quorumPermissionGetOrgDetails(String orgId); }