[PAN-3111] Renames eea_getTransactionReceipt to priv_getTransactionRe…

…ceipt (#10) Signed-off-by: Madeline Murray <[email protected]> * Refactors eeaGetTransactionReceipt to PrivGetTransactionReceipt Signed-off-by: Joshua Richardson <[email protected]> * Fixes typo Signed-off-by: Joshua Richardson <[email protected]> * Bumps web3j version and finishes refactor from eea to priv Signed-off-by: Joshua Richardson <[email protected]>
hyperledger · Sep 22, 2019 · 82eda12 · 82eda12
1 parent bac5c67
commit 82eda12
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 42 deletions.
diff --git a/...ger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java b/...ger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java
@@ -19,7 +19,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions;
 
-import org.web3j.protocol.eea.response.PrivateTransactionReceipt;
+import org.web3j.protocol.pantheon.response.privacy.PrivateTransactionReceipt;
 
 public class ExpectValidPrivateTransactionReceipt implements PrivateCondition {
   private final PrivacyTransactions transactions;

diff --git a/.../EeaGetTransactionReceiptTransaction.java → ...PrivGetTransactionReceiptTransaction.java b/.../EeaGetTransactionReceiptTransaction.java → ...PrivGetTransactionReceiptTransaction.java
@@ -21,16 +21,17 @@
 
 import java.io.IOException;
 
-import org.web3j.protocol.eea.response.PrivateTransactionReceipt;
 import org.web3j.protocol.exceptions.TransactionException;
 import org.web3j.protocol.pantheon.Pantheon;
+import org.web3j.protocol.pantheon.response.privacy.PrivateTransactionReceipt;
 import org.web3j.tx.response.PollingPrivateTransactionReceiptProcessor;
 
-public class EeaGetTransactionReceiptTransaction implements Transaction<PrivateTransactionReceipt> {
+public class PrivGetTransactionReceiptTransaction
+    implements Transaction<PrivateTransactionReceipt> {
 
   private final String transactionHash;
 
-  public EeaGetTransactionReceiptTransaction(final String transactionHash) {
+  public PrivGetTransactionReceiptTransaction(final String transactionHash) {
     this.transactionHash = transactionHash;
   }
 

diff --git a/...g/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java b/...g/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java
@@ -16,8 +16,8 @@
 
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions;
 
-import org.web3j.protocol.eea.response.PrivateTransactionReceipt;
 import org.web3j.protocol.pantheon.response.privacy.PrivacyGroup;
+import org.web3j.protocol.pantheon.response.privacy.PrivateTransactionReceipt;
 
 public class PrivateTransactionVerifier {
 

diff --git a/...va/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java b/...va/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java
@@ -15,15 +15,15 @@
 package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
 
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.EeaGetTransactionReceiptTransaction;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivGetTransactionReceiptTransaction;
 
 import java.util.List;
 
 public class PrivacyTransactions {
 
-  public EeaGetTransactionReceiptTransaction getPrivateTransactionReceipt(
+  public PrivGetTransactionReceiptTransaction getPrivateTransactionReceipt(
       final String transactionHash) {
-    return new EeaGetTransactionReceiptTransaction(transactionHash);
+    return new PrivGetTransactionReceiptTransaction(transactionHash);
   }
 
   public CreatePrivacyGroupTransaction createPrivacyGroup(

diff --git a/...ts/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java b/...ts/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java
@@ -28,7 +28,7 @@
 import org.apache.tuweni.crypto.sodium.Box;
 import org.junit.Before;
 import org.junit.Test;
-import org.web3j.protocol.eea.response.PrivateTransactionReceipt;
+import org.web3j.protocol.pantheon.response.privacy.PrivateTransactionReceipt;
 
 public class EnclaveErrorAcceptanceTest extends PrivacyAcceptanceTestBase {
 

diff --git a/...tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java b/...tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java
@@ -28,8 +28,8 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.web3j.protocol.eea.response.PrivateTransactionReceipt;
 import org.web3j.protocol.pantheon.response.privacy.PrivacyGroup;
+import org.web3j.protocol.pantheon.response.privacy.PrivateTransactionReceipt;
 import org.web3j.utils.Base64String;
 
 public class EthSignerAcceptanceTest extends PrivacyAcceptanceTestBase {

diff --git a/...test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java b/...test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java
@@ -22,7 +22,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.web3j.protocol.eea.response.PrivateTransactionReceipt;
+import org.web3j.protocol.pantheon.response.privacy.PrivateTransactionReceipt;
 
 public class Ibft2PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase {
 

diff --git a/.../src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java b/.../src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java
@@ -22,7 +22,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.web3j.protocol.eea.response.PrivateTransactionReceipt;
+import org.web3j.protocol.pantheon.response.privacy.PrivateTransactionReceipt;
 
 public class PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase {
 

diff --git a/...um/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java b/...um/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java
@@ -92,7 +92,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermRemoveNodesFromWhitelist;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionCount;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionReceipt;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaPrivateNonceProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaSendRawTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivCreatePrivacyGroup;
@@ -101,6 +100,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivacyPrecompileAddress;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivateTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetTransactionCount;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetTransactionReceipt;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer;
@@ -365,14 +365,14 @@ blockchainQueries, new TransactionTracer(blockReplay), parameter),
       if (eea) {
         addMethods(
             enabledMethods,
-            new EeaGetTransactionReceipt(blockchainQueries, enclave, parameter, privacyParameters),
             new EeaSendRawTransaction(privateTransactionHandler, transactionPool, parameter),
             new EeaGetTransactionCount(
                 parameter, new EeaPrivateNonceProvider(enclave, privateTransactionHandler)));
       }
       if (priv) {
         addMethods(
             enabledMethods,
+            new PrivGetTransactionReceipt(blockchainQueries, enclave, parameter, privacyParameters),
             new PrivCreatePrivacyGroup(
                 new Enclave(privacyParameters.getEnclaveUri()), privacyParameters, parameter),
             new PrivDeletePrivacyGroup(

diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java
@@ -38,7 +38,7 @@ public enum RpcMethod {
   PRIV_GET_PRIVATE_TRANSACTION("priv_getPrivateTransaction"),
   PRIV_GET_TRANSACTION_COUNT("priv_getTransactionCount"),
   PRIV_GET_PRIVACY_PRECOMPILE_ADDRESS("priv_getPrivacyPrecompileAddress"),
-  EEA_GET_TRANSACTION_RECEIPT("eea_getTransactionReceipt"),
+  PRIV_GET_TRANSACTION_RECEIPT("priv_getTransactionReceipt"),
   PRIV_CREATE_PRIVACY_GROUP("priv_createPrivacyGroup"),
   PRIV_DELETE_PRIVACY_GROUP("priv_deletePrivacyGroup"),
   PRIV_FIND_PRIVACY_GROUP("priv_findPrivacyGroup"),

diff --git a/...methods/eea/EeaGetTransactionReceipt.java → ...thods/priv/PrivGetTransactionReceipt.java b/...methods/eea/EeaGetTransactionReceipt.java → ...thods/priv/PrivGetTransactionReceipt.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
 import static org.apache.logging.log4j.LogManager.getLogger;
 
@@ -50,7 +50,7 @@
 
 import org.apache.logging.log4j.Logger;
 
-public class EeaGetTransactionReceipt implements JsonRpcMethod {
+public class PrivGetTransactionReceipt implements JsonRpcMethod {
 
   private static final Logger LOG = getLogger();
 
@@ -59,7 +59,7 @@ public class EeaGetTransactionReceipt implements JsonRpcMethod {
   private final JsonRpcParameter parameters;
   private final PrivacyParameters privacyParameters;
 
-  public EeaGetTransactionReceipt(
+  public PrivGetTransactionReceipt(
       final BlockchainQueries blockchain,
       final Enclave enclave,
       final JsonRpcParameter parameters,
@@ -72,12 +72,12 @@ public EeaGetTransactionReceipt(
 
   @Override
   public String getName() {
-    return RpcMethod.EEA_GET_TRANSACTION_RECEIPT.getMethodName();
+    return RpcMethod.PRIV_GET_TRANSACTION_RECEIPT.getMethodName();
   }
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequest request) {
-    LOG.trace("Executing {}", RpcMethod.EEA_GET_TRANSACTION_RECEIPT.getMethodName());
+    LOG.trace("Executing {}", RpcMethod.PRIV_GET_TRANSACTION_RECEIPT.getMethodName());
     final Hash transactionHash = parameters.required(request.getParams(), 0, Hash.class);
     final Optional<TransactionLocation> maybeLocation =
         blockchain.getBlockchain().getTransactionLocation(transactionHash);

diff --git a/...ods/eea/EeaGetTransactionReceiptTest.java → ...s/priv/PrivGetTransactionReceiptTest.java b/...ods/eea/EeaGetTransactionReceiptTest.java → ...s/priv/PrivGetTransactionReceiptTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -59,7 +59,7 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-public class EeaGetTransactionReceiptTest {
+public class PrivGetTransactionReceiptTest {
 
   @Rule public final TemporaryFolder temp = new TemporaryFolder();
 
@@ -163,13 +163,13 @@ public void setUp() {
 
   @Test
   public void returnReceiptIfTransactionExists() {
-    final EeaGetTransactionReceipt eeaGetTransactionReceipt =
-        new EeaGetTransactionReceipt(blockchainQueries, enclave, parameters, privacyParameters);
+    final PrivGetTransactionReceipt privGetTransactionReceipt =
+        new PrivGetTransactionReceipt(blockchainQueries, enclave, parameters, privacyParameters);
     final Object[] params = new Object[] {transaction.hash()};
-    final JsonRpcRequest request = new JsonRpcRequest("1", "eea_getTransactionReceipt", params);
+    final JsonRpcRequest request = new JsonRpcRequest("1", "priv_getTransactionReceipt", params);
 
     final JsonRpcSuccessResponse response =
-        (JsonRpcSuccessResponse) eeaGetTransactionReceipt.response(request);
+        (JsonRpcSuccessResponse) privGetTransactionReceipt.response(request);
     final PrivateTransactionReceiptResult result =
         (PrivateTransactionReceiptResult) response.getResult();
 
@@ -181,14 +181,14 @@ public void enclavePayloadNotFoundResultsInSuccessButNullResponse() {
     when(failingEnclave.receive(any(ReceiveRequest.class)))
         .thenThrow(new EnclaveException("EnclavePayloadNotFound"));
 
-    final EeaGetTransactionReceipt eeaGetTransactionReceipt =
-        new EeaGetTransactionReceipt(
+    final PrivGetTransactionReceipt privGetTransactionReceipt =
+        new PrivGetTransactionReceipt(
             blockchainQueries, failingEnclave, parameters, privacyParameters);
     final Object[] params = new Object[] {transaction.hash()};
-    final JsonRpcRequest request = new JsonRpcRequest("1", "eea_getTransactionReceipt", params);
+    final JsonRpcRequest request = new JsonRpcRequest("1", "priv_getTransactionReceipt", params);
 
     final JsonRpcSuccessResponse response =
-        (JsonRpcSuccessResponse) eeaGetTransactionReceipt.response(request);
+        (JsonRpcSuccessResponse) privGetTransactionReceipt.response(request);
     final PrivateTransactionReceiptResult result =
         (PrivateTransactionReceiptResult) response.getResult();
 
@@ -199,13 +199,13 @@ public void enclavePayloadNotFoundResultsInSuccessButNullResponse() {
   public void markerTransactionNotAvailableResultsInNullResponse() {
     when(blockchain.getTransactionLocation(nullable(Hash.class))).thenReturn(Optional.empty());
 
-    final EeaGetTransactionReceipt eeaGetTransactionReceipt =
-        new EeaGetTransactionReceipt(blockchainQueries, enclave, parameters, privacyParameters);
+    final PrivGetTransactionReceipt privGetTransactionReceipt =
+        new PrivGetTransactionReceipt(blockchainQueries, enclave, parameters, privacyParameters);
     final Object[] params = new Object[] {transaction.hash()};
-    final JsonRpcRequest request = new JsonRpcRequest("1", "eea_getTransactionReceipt", params);
+    final JsonRpcRequest request = new JsonRpcRequest("1", "priv_getTransactionReceipt", params);
 
     final JsonRpcSuccessResponse response =
-        (JsonRpcSuccessResponse) eeaGetTransactionReceipt.response(request);
+        (JsonRpcSuccessResponse) privGetTransactionReceipt.response(request);
     final PrivateTransactionReceiptResult result =
         (PrivateTransactionReceiptResult) response.getResult();
 
@@ -214,13 +214,13 @@ public void markerTransactionNotAvailableResultsInNullResponse() {
 
   @Test
   public void enclaveConnectionIssueThrowsRuntimeException() {
-    final EeaGetTransactionReceipt eeaGetTransactionReceipt =
-        new EeaGetTransactionReceipt(
+    final PrivGetTransactionReceipt privGetTransactionReceipt =
+        new PrivGetTransactionReceipt(
             blockchainQueries, failingEnclave, parameters, privacyParameters);
     final Object[] params = new Object[] {transaction.hash()};
-    final JsonRpcRequest request = new JsonRpcRequest("1", "eea_getTransactionReceipt", params);
+    final JsonRpcRequest request = new JsonRpcRequest("1", "priv_getTransactionReceipt", params);
 
-    final Throwable t = catchThrowable(() -> eeaGetTransactionReceipt.response(request));
+    final Throwable t = catchThrowable(() -> privGetTransactionReceipt.response(request));
     assertThat(t).isInstanceOf(RuntimeException.class);
   }
 }
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -94,10 +94,10 @@ dependencyManagement {
 
     dependency 'org.springframework.security:spring-security-crypto:5.1.5.RELEASE'
 
-    dependency 'org.web3j:abi:4.5.0'
-    dependency 'org.web3j:core:4.5.0'
-    dependency 'org.web3j:crypto:4.5.0'
-    dependency 'org.web3j:pantheon:4.5.0'
+    dependency 'org.web3j:abi:4.5.1'
+    dependency 'org.web3j:core:4.5.1'
+    dependency 'org.web3j:crypto:4.5.1'
+    dependency 'org.web3j:pantheon:4.5.1'
 
     dependency 'org.xerial.snappy:snappy-java:1.1.7.3'