rename url to enodeId for clarity

web3j · Nov 4, 2019 · c65db45 · c65db45
1 parent c82eef2
commit c65db45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git 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<?, PermissionRoleList> quorumPermissionGetRoleList() {
 
  @Override
  public Request<?, ExecStatusInfo> 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<?, ExecStatusInfo> 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<?, ExecStatusInfo> 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<?, ExecStatusInfo> quorumPermissionApproveOrgStatus(
 
  @Override
  public Request<?, ExecStatusInfo> 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<?, ExecStatusInfo> 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<?, ExecStatusInfo> quorumPermissionUpdateAccountStatus(
  }
 
  @Override
- public Request<?, OrgDetailsInfo> quorumPermissionGetOrgDetails(
- String orgId, PrivateTransaction transaction) {
+ public Request<?, OrgDetailsInfo> 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
@@ -90,13 +90,13 @@ Request<?, EthSendTransaction> ethSendRawPrivateTransaction(
  Request<?, PermissionAccountList> quorumPermissionGetAccountList();
 
  Request<?, ExecStatusInfo> quorumPermissionAddOrg(
- String orgId, String url, String address, PrivateTransaction transaction);
+ String orgId, String enodeId, String address, PrivateTransaction transaction);
 
  Request<?, ExecStatusInfo> quorumPermissionApproveOrg(
- String orgId, String url, String address, PrivateTransaction transaction);
+ String orgId, String enodeId, String address, PrivateTransaction transaction);
 
  Request<?, ExecStatusInfo> quorumPermissionAddSubOrg(
- String pOrgId, String orgId, String url, PrivateTransaction transaction);
+ String pOrgId, String orgId, String enodeId, PrivateTransaction transaction);
 
  Request<?, ExecStatusInfo> quorumPermissionUpdateOrgStatus(
  String orgId, int action, PrivateTransaction transaction);
@@ -105,10 +105,10 @@ Request<?, ExecStatusInfo> quorumPermissionApproveOrgStatus(
  String orgId, int action, PrivateTransaction transaction);
 
  Request<?, ExecStatusInfo> quorumPermissionAddNode(
- String orgId, String url, PrivateTransaction transaction);
+ String orgId, String enodeId, PrivateTransaction transaction);
 
  Request<?, ExecStatusInfo> quorumPermissionUpdateNodeStatus(
- String orgId, String url, int action, PrivateTransaction transaction);
+ String orgId, String enodeId, int action, PrivateTransaction transaction);
 
  Request<?, ExecStatusInfo> quorumPermissionAssignAdminRole(
  String orgId, String address, String roleid, PrivateTransaction transaction);
@@ -136,6 +136,5 @@ Request<?, ExecStatusInfo> quorumPermissionChangeAccountRole(
  Request<?, ExecStatusInfo> quorumPermissionUpdateAccountStatus(
  String orgId, String address, int status, PrivateTransaction transaction);
 
- Request<?, OrgDetailsInfo> quorumPermissionGetOrgDetails(
- String orgId, PrivateTransaction transaction);
+ Request<?, OrgDetailsInfo> quorumPermissionGetOrgDetails(String orgId);
 }