AtHeartEngineer/linea-besu
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-besu.git synced 2026-01-09 15:37:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix GoQuorum privacy (#2184)

Browse Source 
* fix goQuorum privacy

Signed-off-by: Stefan Pingel <stefan.pingel@consensys.net>
This commit is contained in:
Stefan Pingel
2021-04-27 10:41:29 +10:00
committed by GitHub
parent efe845b4b1
commit 8267f90fdd
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java
View File

@@ -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=";

4
enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java
View File

@@ -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<String> publicKeys = Arrays.asList("/+UuD63zItL1EbjxkKUljMgG8Z1w0AJ8pNOR4iq2yQc=");

16
enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java
View File

@@ -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> T get(
final String mediaType,
final Object content,
final String endpoint,
final ResponseBodyHandler<T> 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;
}