Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BESU-146 - check if success and return errorResponse otherwise #424

Merged
merged 8 commits into from
Feb 26, 2020
Merged

BESU-146 - check if success and return errorResponse otherwise #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4d1ee88
BESU-146 - check if success and return errorResponse otherwise
anthonybuckle Feb 21, 2020
931aab8
BESU-146 - applied spotless
anthonybuckle Feb 21, 2020
11c3357
BESU-146 - corrected gas estimate test case
anthonybuckle Feb 21, 2020
47ba91e
BESU-146 - applied spotless
anthonybuckle Feb 21, 2020
a2136f5
BESU-146 - added failure test case for gas estimate
anthonybuckle Feb 21, 2020
7a84d9a
Merge branch 'master' into master
anthonybuckle Feb 22, 2020
a1c4d0f
Merge branch 'master' into master
CjHare Feb 24, 2020
4da6c0d
Merge branch 'master' into master
CjHare Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@ private JsonCallParameter overrideGasLimitAndPrice(
private Function<TransactionSimulatorResult, JsonRpcResponse> gasEstimateResponse(
final JsonRpcRequestContext request) {
return result ->
new JsonRpcSuccessResponse(
request.getRequest().getId(), Quantity.create(result.getGasEstimate()));
result.isSuccessful()
? new JsonRpcSuccessResponse(
request.getRequest().getId(), Quantity.create(result.getGasEstimate()))
: null;
}

private JsonRpcErrorResponse errorResponse(final JsonRpcRequestContext request) {
Expand Down
20 changes: 17 additions & 3 deletions ...t/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,35 @@ public void shouldReturnErrorWhenTransientTransactionProcessorReturnsEmpty() {
}

@Test
public void shouldReturnGasEstimateWhenTransientTransactionProcessorReturnsResult() {
public void shouldReturnGasEstimateWhenTransientTransactionProcessorReturnsResultSuccess() {
final JsonRpcRequestContext request = ethEstimateGasRequest(callParameter());
mockTransientProcessorResultGasEstimate(1L);
mockTransientProcessorResultGasEstimate(1L, true);

final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, Quantity.create(1L));

Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
}

private void mockTransientProcessorResultGasEstimate(final long gasEstimate) {
@Test
public void shouldReturnGasEstimateErrorWhenTransientTransactionProcessorReturnsResultFailure() {
final JsonRpcRequestContext request = ethEstimateGasRequest(callParameter());
mockTransientProcessorResultGasEstimate(1L, false);

final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, JsonRpcError.INTERNAL_ERROR);

Assertions.assertThat(method.response(request))
.isEqualToComparingFieldByField(expectedResponse);
}

private void mockTransientProcessorResultGasEstimate(
final long gasEstimate, final boolean isSuccessful) {
final TransactionSimulatorResult result = mock(TransactionSimulatorResult.class);
when(result.getGasEstimate()).thenReturn(gasEstimate);
when(transactionSimulator.process(eq(modifiedCallParameter()), eq(1L)))
.thenReturn(Optional.of(result));
when(result.isSuccessful()).thenReturn(isSuccessful);
}

private JsonCallParameter callParameter() {
Expand Down