Adds priv commandline switch

PegaSysEng · Jul 23, 2019 · 5bc6242 · 5bc6242
1 parent 0fafaca
commit 5bc6242
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/...pantheon/tests/acceptance/dsl/node/configuration/PantheonFactoryConfigurationBuilder.java b/...pantheon/tests/acceptance/dsl/node/configuration/PantheonFactoryConfigurationBuilder.java
@@ -86,6 +86,7 @@ public PantheonFactoryConfigurationBuilder jsonRpcEnabled() {
   public PantheonFactoryConfigurationBuilder enablePrivateTransactions(
       final PrivacyParameters privacyParameters) {
     this.jsonRpcConfiguration.addRpcApi(RpcApis.EEA);
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.PRIV);
     this.privacyParameters = privacyParameters;
     this.privacyParameters.setEnabled(true);
     return this;

diff --git a/...m/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java b/...m/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java
@@ -331,7 +331,11 @@ blockchainQueries, new TransactionTracer(blockReplay), parameter),
           new EeaSendRawTransaction(
               blockchainQueries, privateTransactionHandler, transactionPool, parameter),
           new EeaGetTransactionCount(parameter, privateTransactionHandler),
-          new EeaGetPrivateTransaction(enclave, parameter, privacyParameters),
+          new EeaGetPrivateTransaction(enclave, parameter, privacyParameters));
+    }
+    if (rpcApis.contains(RpcApis.PRIV)) {
+      addMethods(
+          enabledMethods,
           new PrivCreatePrivacyGroup(new Enclave(privacyParameters.getEnclaveUri()), parameter),
           new PrivDeletePrivacyGroup(new Enclave(privacyParameters.getEnclaveUri()), parameter),
           new PrivFindPrivacyGroup(new Enclave(privacyParameters.getEnclaveUri()), parameter),

diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/RpcApis.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/RpcApis.java
@@ -26,6 +26,7 @@ public class RpcApis {
   public static final RpcApi WEB3 = new RpcApi("WEB3");
   public static final RpcApi ADMIN = new RpcApi("ADMIN");
   public static final RpcApi EEA = new RpcApi("EEA");
+  public static final RpcApi PRIV = new RpcApi("PRIV");
   public static final RpcApi TX_POOL = new RpcApi("TXPOOL");
 
   public static final List<RpcApi> DEFAULT_JSON_RPC_APIS = Arrays.asList(ETH, NET, WEB3);
@@ -47,6 +48,8 @@ public static Optional<RpcApi> valueOf(final String name) {
       return Optional.of(ADMIN);
     } else if (name.equals(EEA.getCliValue())) {
       return Optional.of(EEA);
+    } else if (name.equals(PRIV.getCliValue())) {
+      return Optional.of(PRIV);
     } else if (name.equals(TX_POOL.getCliValue())) {
       return Optional.of(TX_POOL);
     } else {