diff --git a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java index 928938dad..0938fac31 100644 --- a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java +++ b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java @@ -44,7 +44,7 @@ import org.web3j.quorum.Quorum; public class ContainerTestBase { private final String besuImage = System.getProperty("containertest.imagename"); private final String goQuorumVersion = "21.1.0"; - private final String tesseraVersion = "21.1.0"; + private final String tesseraVersion = "21.1.1"; protected final String goQuorumTesseraPubKey = "3XGBIf+x8IdVQOVfIsbRnHwTYOJP/Fx84G8gMmy8qDM="; protected final String besuTesseraPubKey = "8JJLEAbq6o9m4Kqm++v0Y1n9Z2ryAFtZTyhnxSKWgws="; diff --git a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java index 34ef03330..617147f58 100644 --- a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java +++ b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java @@ -60,7 +60,7 @@ public class GoQuorumEnclaveTest { @Test public void receiveThrowsWhenPayloadDoesNotExist() { - when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/receive"), any())) + when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/transaction"), any())) .thenThrow( new EnclaveClientException(404, "Message with hash " + MOCK_KEY + " was not found")); @@ -72,7 +72,7 @@ public class GoQuorumEnclaveTest { @Test public void sendAndReceive() { when(vertxTransmitter.post(any(), any(), any(), any())).thenReturn(new SendResponse(KEY)); - when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/receive"), any())) + when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/transaction"), any())) .thenReturn(new GoQuorumReceiveResponse(PAYLOAD, 0, null, null)); final List publicKeys = Arrays.asList("/+UuD63zItL1EbjxkKUljMgG8Z1w0AJ8pNOR4iq2yQc="); diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java b/enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java index 1fbbba0cd..a5178f9bf 100644 --- a/enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java @@ -19,11 +19,11 @@ import org.hyperledger.besu.enclave.types.GoQuorumReceiveResponse; import org.hyperledger.besu.enclave.types.GoQuorumSendRequest; import org.hyperledger.besu.enclave.types.GoQuorumSendSignedRequest; import org.hyperledger.besu.enclave.types.GoQuorumStoreRawRequest; -import org.hyperledger.besu.enclave.types.ReceiveRequest; import org.hyperledger.besu.enclave.types.SendResponse; import org.hyperledger.besu.enclave.types.StoreRawResponse; import java.io.IOException; +import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.List; @@ -81,11 +81,9 @@ public class GoQuorumEnclave { } public GoQuorumReceiveResponse receive(final String payloadKey) { - final ReceiveRequest request = new ReceiveRequest(payloadKey); return get( JSON, - request, - "/receive", + "/transaction/" + URLEncoder.encode(payloadKey, StandardCharsets.UTF_8), (statusCode, body) -> handleJsonResponse(statusCode, body, GoQuorumReceiveResponse.class, 200)); } @@ -107,17 +105,9 @@ public class GoQuorumEnclave { private T get( final String mediaType, - final Object content, final String endpoint, final ResponseBodyHandler responseBodyHandler) { - final String bodyText; - try { - bodyText = objectMapper.writeValueAsString(content); - } catch (final JsonProcessingException e) { - throw new EnclaveClientException(400, "Unable to serialize request."); - } - - final T t = requestTransmitter.get(mediaType, bodyText, endpoint, responseBodyHandler); + final T t = requestTransmitter.get(mediaType, null, endpoint, responseBodyHandler); return t; }