From ac11f99be13c53398f71cbe9cc59a6d2d59f531a Mon Sep 17 00:00:00 2001 From: Joshua Richardson Date: Mon, 16 Sep 2019 15:31:51 +0100 Subject: [PATCH 1/3] Refactors eeaGetTransactionReceipt to PrivGetTransactionReceipt Signed-off-by: Joshua Richardson --- ...PrivGetTransactionReceiptTransaction.java} | 4 +- .../transaction/PrivacyTransactions.java | 6 +- .../api/jsonrpc/JsonRpcMethodsFactory.java | 4 +- .../besu/ethereum/api/jsonrpc/RpcMethod.java | 2 +- .../PrevGetTransactionReceipt.java} | 10 +-- .../PrivGetTransactionReceiptTest.java} | 61 +++++++++---------- 6 files changed, 43 insertions(+), 44 deletions(-) rename acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/{EeaGetTransactionReceiptTransaction.java => PrivGetTransactionReceiptTransaction.java} (90%) rename ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/{eea/EeaGetTransactionReceipt.java => priv/PrevGetTransactionReceipt.java} (96%) rename ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/{eea/EeaGetTransactionReceiptTest.java => priv/PrivGetTransactionReceiptTest.java} (87%) diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java similarity index 90% rename from acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java index f7644ce1b76..f34c2c29eed 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java @@ -24,11 +24,11 @@ import org.web3j.protocol.pantheon.Pantheon; import org.web3j.tx.response.PollingPrivateTransactionReceiptProcessor; -public class EeaGetTransactionReceiptTransaction implements Transaction { +public class PrivGetTransactionReceiptTransaction implements Transaction { private final String transactionHash; - public EeaGetTransactionReceiptTransaction(final String transactionHash) { + public PrivGetTransactionReceiptTransaction(final String transactionHash) { this.transactionHash = transactionHash; } diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java index e47545a52b8..a06d1f9da86 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java @@ -13,15 +13,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/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java index 5024ae04f69..6cd62e3310b 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java @@ -90,7 +90,7 @@ 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.priv.PrevGetTransactionReceipt; 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; @@ -363,7 +363,6 @@ 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))); @@ -371,6 +370,7 @@ blockchainQueries, new TransactionTracer(blockReplay), parameter), if (priv) { addMethods( enabledMethods, + new PrevGetTransactionReceipt(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 index 55ab7c5ba1e..0102e7aa80f 100644 --- 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 @@ -36,7 +36,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/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrevGetTransactionReceipt.java similarity index 96% rename from ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrevGetTransactionReceipt.java index 640bda7050f..730ebfb1ec0 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrevGetTransactionReceipt.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -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; @@ -48,7 +48,7 @@ import org.apache.logging.log4j.Logger; -public class EeaGetTransactionReceipt implements JsonRpcMethod { +public class PrevGetTransactionReceipt implements JsonRpcMethod { private static final Logger LOG = getLogger(); @@ -57,7 +57,7 @@ public class EeaGetTransactionReceipt implements JsonRpcMethod { private final JsonRpcParameter parameters; private final PrivacyParameters privacyParameters; - public EeaGetTransactionReceipt( + public PrevGetTransactionReceipt( final BlockchainQueries blockchain, final Enclave enclave, final JsonRpcParameter parameters, @@ -70,12 +70,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 maybeLocation = blockchain.getBlockchain().getTransactionLocation(transactionHash); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java similarity index 87% rename from ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java index 29fc1757fc1..6cd6eaf0ad7 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java @@ -10,16 +10,9 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea; - -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.catchThrowable; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; +import com.google.common.collect.Lists; import org.hyperledger.besu.crypto.SECP256K1; import org.hyperledger.besu.enclave.Enclave; import org.hyperledger.besu.enclave.EnclaveException; @@ -45,19 +38,25 @@ import org.hyperledger.besu.ethereum.rlp.RLP; import org.hyperledger.besu.util.bytes.Bytes32; import org.hyperledger.besu.util.bytes.BytesValue; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; import java.math.BigInteger; import java.util.Base64; import java.util.Collections; import java.util.Optional; -import com.google.common.collect.Lists; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowable; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -public class EeaGetTransactionReceiptTest { +public class PrivGetTransactionReceiptTest { @Rule public final TemporaryFolder temp = new TemporaryFolder(); @@ -161,13 +160,13 @@ public void setUp() { @Test public void returnReceiptIfTransactionExists() { - final EeaGetTransactionReceipt eeaGetTransactionReceipt = - new EeaGetTransactionReceipt(blockchainQueries, enclave, parameters, privacyParameters); + final PrevGetTransactionReceipt prevGetTransactionReceipt = + new PrevGetTransactionReceipt(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) prevGetTransactionReceipt.response(request); final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); @@ -179,14 +178,14 @@ public void enclavePayloadNotFoundResultsInSuccessButNullResponse() { when(failingEnclave.receive(any(ReceiveRequest.class))) .thenThrow(new EnclaveException("EnclavePayloadNotFound")); - final EeaGetTransactionReceipt eeaGetTransactionReceipt = - new EeaGetTransactionReceipt( + final PrevGetTransactionReceipt prevGetTransactionReceipt = + new PrevGetTransactionReceipt( 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) prevGetTransactionReceipt.response(request); final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); @@ -197,13 +196,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 PrevGetTransactionReceipt prevGetTransactionReceipt = + new PrevGetTransactionReceipt(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) prevGetTransactionReceipt.response(request); final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); @@ -212,13 +211,13 @@ public void markerTransactionNotAvailableResultsInNullResponse() { @Test public void enclaveConnectionIssueThrowsRuntimeException() { - final EeaGetTransactionReceipt eeaGetTransactionReceipt = - new EeaGetTransactionReceipt( + final PrevGetTransactionReceipt prevGetTransactionReceipt = + new PrevGetTransactionReceipt( 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(() -> prevGetTransactionReceipt.response(request)); assertThat(t).isInstanceOf(RuntimeException.class); } } From b7fa8b6259332c364d93d1443cc3ecfa9776270d Mon Sep 17 00:00:00 2001 From: Joshua Richardson Date: Wed, 18 Sep 2019 21:27:20 +0100 Subject: [PATCH 2/3] Fixes typo Signed-off-by: Joshua Richardson --- acceptance-tests/dsl/build.gradle | 2 - .../PrivGetTransactionReceiptTransaction.java | 3 +- .../api/jsonrpc/JsonRpcMethodsFactory.java | 4 +- ...pt.java => PrivGetTransactionReceipt.java} | 4 +- .../priv/PrivGetTransactionReceiptTest.java | 49 ++++++++++--------- 5 files changed, 31 insertions(+), 31 deletions(-) rename ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/{PrevGetTransactionReceipt.java => PrivGetTransactionReceipt.java} (98%) diff --git a/acceptance-tests/dsl/build.gradle b/acceptance-tests/dsl/build.gradle index b15d83d8615..89807a09e20 100644 --- a/acceptance-tests/dsl/build.gradle +++ b/acceptance-tests/dsl/build.gradle @@ -42,6 +42,4 @@ dependencies { implementation 'tech.pegasys.ethsigner.internal:core' implementation 'tech.pegasys.ethsigner.internal:file-based' implementation 'tech.pegasys.ethsigner.internal:signing-api' - - } diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java index f34c2c29eed..a2089b249d0 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java @@ -24,7 +24,8 @@ import org.web3j.protocol.pantheon.Pantheon; import org.web3j.tx.response.PollingPrivateTransactionReceiptProcessor; -public class PrivGetTransactionReceiptTransaction implements Transaction { +public class PrivGetTransactionReceiptTransaction + implements Transaction { private final String transactionHash; diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java index 6cd62e3310b..a4a287148e9 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java @@ -90,7 +90,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.priv.PrevGetTransactionReceipt; 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; @@ -99,6 +98,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; @@ -370,7 +370,7 @@ blockchainQueries, new TransactionTracer(blockReplay), parameter), if (priv) { addMethods( enabledMethods, - new PrevGetTransactionReceipt(blockchainQueries, enclave, parameter, privacyParameters), + 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/internal/privacy/methods/priv/PrevGetTransactionReceipt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java similarity index 98% rename from ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrevGetTransactionReceipt.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java index 730ebfb1ec0..2bb3485cb41 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrevGetTransactionReceipt.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java @@ -48,7 +48,7 @@ import org.apache.logging.log4j.Logger; -public class PrevGetTransactionReceipt implements JsonRpcMethod { +public class PrivGetTransactionReceipt implements JsonRpcMethod { private static final Logger LOG = getLogger(); @@ -57,7 +57,7 @@ public class PrevGetTransactionReceipt implements JsonRpcMethod { private final JsonRpcParameter parameters; private final PrivacyParameters privacyParameters; - public PrevGetTransactionReceipt( + public PrivGetTransactionReceipt( final BlockchainQueries blockchain, final Enclave enclave, final JsonRpcParameter parameters, diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java index 6cd6eaf0ad7..c0c39641926 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java @@ -12,7 +12,14 @@ */ package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; -import com.google.common.collect.Lists; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowable; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.hyperledger.besu.crypto.SECP256K1; import org.hyperledger.besu.enclave.Enclave; import org.hyperledger.besu.enclave.EnclaveException; @@ -38,23 +45,17 @@ import org.hyperledger.besu.ethereum.rlp.RLP; import org.hyperledger.besu.util.bytes.Bytes32; import org.hyperledger.besu.util.bytes.BytesValue; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; import java.math.BigInteger; import java.util.Base64; import java.util.Collections; import java.util.Optional; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.catchThrowable; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import com.google.common.collect.Lists; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class PrivGetTransactionReceiptTest { @@ -160,13 +161,13 @@ public void setUp() { @Test public void returnReceiptIfTransactionExists() { - final PrevGetTransactionReceipt prevGetTransactionReceipt = - new PrevGetTransactionReceipt(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", "priv_getTransactionReceipt", params); final JsonRpcSuccessResponse response = - (JsonRpcSuccessResponse) prevGetTransactionReceipt.response(request); + (JsonRpcSuccessResponse) privGetTransactionReceipt.response(request); final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); @@ -178,14 +179,14 @@ public void enclavePayloadNotFoundResultsInSuccessButNullResponse() { when(failingEnclave.receive(any(ReceiveRequest.class))) .thenThrow(new EnclaveException("EnclavePayloadNotFound")); - final PrevGetTransactionReceipt prevGetTransactionReceipt = - new PrevGetTransactionReceipt( + final PrivGetTransactionReceipt privGetTransactionReceipt = + new PrivGetTransactionReceipt( blockchainQueries, failingEnclave, parameters, privacyParameters); final Object[] params = new Object[] {transaction.hash()}; final JsonRpcRequest request = new JsonRpcRequest("1", "priv_getTransactionReceipt", params); final JsonRpcSuccessResponse response = - (JsonRpcSuccessResponse) prevGetTransactionReceipt.response(request); + (JsonRpcSuccessResponse) privGetTransactionReceipt.response(request); final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); @@ -196,13 +197,13 @@ public void enclavePayloadNotFoundResultsInSuccessButNullResponse() { public void markerTransactionNotAvailableResultsInNullResponse() { when(blockchain.getTransactionLocation(nullable(Hash.class))).thenReturn(Optional.empty()); - final PrevGetTransactionReceipt prevGetTransactionReceipt = - new PrevGetTransactionReceipt(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", "priv_getTransactionReceipt", params); final JsonRpcSuccessResponse response = - (JsonRpcSuccessResponse) prevGetTransactionReceipt.response(request); + (JsonRpcSuccessResponse) privGetTransactionReceipt.response(request); final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); @@ -211,13 +212,13 @@ public void markerTransactionNotAvailableResultsInNullResponse() { @Test public void enclaveConnectionIssueThrowsRuntimeException() { - final PrevGetTransactionReceipt prevGetTransactionReceipt = - new PrevGetTransactionReceipt( + final PrivGetTransactionReceipt privGetTransactionReceipt = + new PrivGetTransactionReceipt( blockchainQueries, failingEnclave, parameters, privacyParameters); final Object[] params = new Object[] {transaction.hash()}; final JsonRpcRequest request = new JsonRpcRequest("1", "priv_getTransactionReceipt", params); - final Throwable t = catchThrowable(() -> prevGetTransactionReceipt.response(request)); + final Throwable t = catchThrowable(() -> privGetTransactionReceipt.response(request)); assertThat(t).isInstanceOf(RuntimeException.class); } } From c637589a89eefd8a7cf2959b8104d47b147ecf59 Mon Sep 17 00:00:00 2001 From: Joshua Richardson Date: Thu, 19 Sep 2019 12:58:36 +0100 Subject: [PATCH 3/3] Bumps web3j version and finishes refactor from eea to priv Signed-off-by: Joshua Richardson --- .../condition/ExpectValidPrivateTransactionReceipt.java | 2 +- .../condition/PrivGetTransactionReceiptTransaction.java | 2 +- .../dsl/privacy/condition/PrivateTransactionVerifier.java | 2 +- .../tests/web3j/privacy/EnclaveErrorAcceptanceTest.java | 2 +- .../besu/tests/web3j/privacy/EthSignerAcceptanceTest.java | 2 +- .../web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java | 2 +- .../tests/web3j/privacy/PrivacyClusterAcceptanceTest.java | 2 +- gradle/versions.gradle | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java index 8ddbc184683..04a064a744f 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java @@ -17,7 +17,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/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java index a2089b249d0..d70cf935246 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivGetTransactionReceiptTransaction.java @@ -19,9 +19,9 @@ 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 PrivGetTransactionReceiptTransaction diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java index b408351077e..2633c88216e 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java @@ -14,8 +14,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/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java index a12bc55eb48..63f74da3e4d 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java @@ -26,7 +26,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/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java index b27fae80f04..d1e2f3fbfbc 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java @@ -26,8 +26,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/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java index 71337d35e6a..9e8f876fee6 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java @@ -20,7 +20,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/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java index fcda4e69d05..963fe214209 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java @@ -20,7 +20,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/gradle/versions.gradle b/gradle/versions.gradle index 24ae7e34e11..e2050020942 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -92,10 +92,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'