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 selection of receive RPC (#2197)

Browse Source 
* fix selection of receive RPC

Signed-off-by: Stefan Pingel <stefan.pingel@consensys.net>
This commit is contained in:
Stefan Pingel
2021-04-28 14:08:25 +10:00
committed by GitHub
parent fb42320b74
commit 4e63f3c210
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ package org.hyperledger.besu.enclave;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -52,7 +53,8 @@ public class GoQuorumEnclaveTest {
@Test
public void upCheck() {
when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/upcheck"), any()))
when(vertxTransmitter.get(
any(), any(), ArgumentMatchers.contains("/upcheck"), any(), anyBoolean()))
.thenReturn("I'm up!");
assertThat(enclave.upCheck()).isTrue();
@@ -60,7 +62,8 @@ public class GoQuorumEnclaveTest {
@Test
public void receiveThrowsWhenPayloadDoesNotExist() {
when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/transaction"), any()))
when(vertxTransmitter.get(
any(), any(), ArgumentMatchers.contains("/transaction"), any(), anyBoolean()))
.thenThrow(
new EnclaveClientException(404, "Message with hash " + MOCK_KEY + " was not found"));
@@ -72,7 +75,8 @@ 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("/transaction"), any()))
when(vertxTransmitter.get(
any(), any(), ArgumentMatchers.contains("/transaction"), any(), anyBoolean()))
.thenReturn(new GoQuorumReceiveResponse(PAYLOAD, 0, null, null));
final List<String> publicKeys = Arrays.asList("/+UuD63zItL1EbjxkKUljMgG8Z1w0AJ8pNOR4iq2yQc=");

2
enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java
View File

@@ -49,7 +49,7 @@ public class Enclave {
public boolean upCheck() {
try {
final String upcheckResponse =
requestTransmitter.get(null, null, "/upcheck", this::handleRawResponse);
requestTransmitter.get(null, null, "/upcheck", this::handleRawResponse, false);
return upcheckResponse.equals("I'm up!");
} catch (final Exception e) {
return false;

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

@@ -44,7 +44,7 @@ public class GoQuorumEnclave {
public boolean upCheck() {
try {
final String upcheckResponse =
requestTransmitter.get(null, null, "/upcheck", this::handleRawResponse);
requestTransmitter.get(null, null, "/upcheck", this::handleRawResponse, false);
return upcheckResponse.equals("I'm up!");
} catch (final Exception e) {
return false;
@@ -99,7 +99,6 @@ public class GoQuorumEnclave {
} catch (final JsonProcessingException e) {
throw new EnclaveClientException(400, "Unable to serialize request.");
}
return requestTransmitter.post(mediaType, bodyText, endpoint, responseBodyHandler);
}
@@ -107,7 +106,7 @@ public class GoQuorumEnclave {
final String mediaType,
final String endpoint,
final ResponseBodyHandler<T> responseBodyHandler) {
final T t = requestTransmitter.get(mediaType, null, endpoint, responseBodyHandler);
final T t = requestTransmitter.get(mediaType, null, endpoint, responseBodyHandler, true);
return t;
}

3
enclave/src/main/java/org/hyperledger/besu/enclave/RequestTransmitter.java
View File

@@ -31,5 +31,6 @@ public interface RequestTransmitter {
String mediaType,
String content,
String endpoint,
ResponseBodyHandler<T> responseBodyHandler);
ResponseBodyHandler<T> responseBodyHandler,
final boolean withAcceptJsonHeader);
}

22
enclave/src/main/java/org/hyperledger/besu/enclave/VertxRequestTransmitter.java
View File

@@ -18,6 +18,7 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import io.netty.handler.codec.http.HttpHeaderNames;
import io.vertx.core.http.HttpClient;
import io.vertx.core.http.HttpClientRequest;
import io.vertx.core.http.HttpClientResponse;
@@ -26,6 +27,7 @@ import io.vertx.core.http.HttpMethod;
public class VertxRequestTransmitter implements RequestTransmitter {
private static final String APPLICATION_JSON = "application/json";
private final HttpClient client;
private static final long REQUEST_TIMEOUT_MS = 5000L;
@@ -40,7 +42,12 @@ public class VertxRequestTransmitter implements RequestTransmitter {
final String endpoint,
final ResponseBodyHandler<T> responseHandler) {
return sendRequest(
HttpMethod.POST, Optional.of(contentType), Optional.of(content), endpoint, responseHandler);
HttpMethod.POST,
Optional.of(contentType),
Optional.of(content),
endpoint,
responseHandler,
false);
}
@Override
@@ -48,13 +55,15 @@ public class VertxRequestTransmitter implements RequestTransmitter {
final String contentType,
final String content,
final String endpoint,
final ResponseBodyHandler<T> responseHandler) {
final ResponseBodyHandler<T> responseHandler,
final boolean withAcceptJsonHeader) {
return sendRequest(
HttpMethod.GET,
Optional.ofNullable(contentType),
Optional.ofNullable(content),
endpoint,
responseHandler);
responseHandler,
withAcceptJsonHeader);
}
protected <T> T sendRequest(
@@ -62,7 +71,8 @@ public class VertxRequestTransmitter implements RequestTransmitter {
final Optional<String> contentType,
final Optional<String> content,
final String endpoint,
final ResponseBodyHandler<T> responseHandler) {
final ResponseBodyHandler<T> responseHandler,
final boolean withAcceptJsonHeader) {
try {
final CompletableFuture<T> result = new CompletableFuture<>();
final HttpClientRequest request =
@@ -72,6 +82,10 @@ public class VertxRequestTransmitter implements RequestTransmitter {
.setTimeout(REQUEST_TIMEOUT_MS)
.exceptionHandler(result::completeExceptionally)
.setChunked(false);
if (withAcceptJsonHeader) {
// this is needed when using Tessera GET /transaction/{hash} to choose the right RPC
request.putHeader(HttpHeaderNames.ACCEPT, APPLICATION_JSON);
}
contentType.ifPresent(ct -> request.putHeader(HttpHeaders.CONTENT_TYPE, ct));
if (content.isPresent()) {
request.end(content.get());