Skip to content

Commit

Permalink
Refactor queryForObject to remove code duplication
Browse files Browse the repository at this point in the history
  • Loading branch information
@ml-james
ml-james committed Oct 31, 2024
1 parent 147afee commit 677c778
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 107 deletions.
2 changes: 2 additions & 0 deletions client/src/main/java/com/lmax/solana4j/client/api/SolanaApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,6 @@ public interface SolanaApi
* @throws SolanaJsonRpcClientException if there is an error with the JSON-RPC request
*/
SolanaClientResponse<Long> getMinimumBalanceForRentExemption(int size) throws SolanaJsonRpcClientException;

// SolanaClientResponse<SimulateTransactionResponse> simulateTransaction(String transaction) throws SolanaJsonRpcClientException;
}
175 changes: 75 additions & 100 deletions client/src/main/java/com/lmax/solana4j/client/jsonrpc/SolanaJsonRpcClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.time.Duration;
import java.util.Locale;
import java.util.Map;
import java.util.function.Function;

public class SolanaJsonRpcClient implements SolanaApi
{
Expand Down Expand Up @@ -50,179 +51,153 @@ public SolanaJsonRpcClient(final String rpcUrl, final Duration connectionTimeout
@Override
public SolanaClientResponse<String> requestAirdrop(final String address, final long amountLamports) throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<String>>()
{
}, "requestAirdrop", address, amountLamports);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess());
return queryForObject(
new TypeReference<RpcWrapperDTO<String>>()
{
},
"requestAirdrop",
dto -> dto,
address,
amountLamports);
}

@Override
public SolanaClientResponse<TransactionResponse> getTransaction(final String transactionSignature) throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<TransactionResponseDTO>>()
{
},
return queryForObject(new TypeReference<RpcWrapperDTO<TransactionResponseDTO>>()
{
},
"getTransaction",
dto -> dto,
transactionSignature,
Map.of(
"econding", "jsonParsed",
"maxSupportedTransactionVersion", 0
)
);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess());
}

@Override
public SolanaClientResponse<String> sendTransaction(final String transactionBlob) throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<String>>()
{
},
return queryForObject(new TypeReference<RpcWrapperDTO<String>>()
{
},
"sendTransaction",
dto -> dto,
transactionBlob,
Map.of("preflightCommitment", Commitment.FINALIZED.toString().toLowerCase(Locale.UK))
);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess());
}

@Override
public SolanaClientResponse<Long> getBalance(final String address) throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<BalanceDTO>>()
{
},
return queryForObject(new TypeReference<>()
{
},
"getBalance",
BalanceDTO::getValue,
address);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess().getValue());
}

@Override
public SolanaClientResponse<TokenAmount> getTokenAccountBalance(final String address) throws SolanaJsonRpcClientException
{
final var result = queryForObject(
new TypeReference<RpcWrapperDTO<TokenAmountDTO>>()
return queryForObject(
new TypeReference<>()
{
},
"getTokenAccountBalance",
TokenAmountDTO::getValue,
address);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess().getValue());
}

@Override
public SolanaClientResponse<AccountInfo> getAccountInfo(final String address) throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<AccountInfoDTO>>()
{
},
return queryForObject(new TypeReference<RpcWrapperDTO<AccountInfoDTO>>()
{
},
"getAccountInfo",
AccountInfoDTO::getValue,
address,
Map.of("encoding", "base64")
);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess().getValue());
}

@Override
public SolanaClientResponse<Long> getBlockHeight() throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<Long>>()
{
}, "getBlockHeight");
return queryForObject(new TypeReference<RpcWrapperDTO<Long>>()
{
},
"getBlockHeight",
dto -> dto);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess());
}

@Override
public SolanaClientResponse<Long> getSlot() throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<Long>>()
{
}, "getSlot");

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess());
return queryForObject(new TypeReference<RpcWrapperDTO<Long>>()
{
},
"getSlot",
dto -> dto);
}

@Override
public SolanaClientResponse<Blockhash> getLatestBlockhash() throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<BlockhashDTO>>()
{
}, "getLatestBlockhash");

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess().getValue());
return queryForObject(new TypeReference<RpcWrapperDTO<BlockhashDTO>>()
{
},
"getLatestBlockhash",
BlockhashDTO::getValue);
}

@Override
public SolanaClientResponse<Long> getMinimumBalanceForRentExemption(final int size) throws SolanaJsonRpcClientException
{
final var result = queryForObject(new TypeReference<RpcWrapperDTO<Long>>()
{
}, "getMinimumBalanceForRentExemption", size);

if (result.isError())
{
return new SolanaJsonRpcClientResponse<>(result.getError().getErrorCode());
}

return new SolanaJsonRpcClientResponse<>(result.getSuccess());
return queryForObject(
new TypeReference<RpcWrapperDTO<Long>>()
{
},
"getMinimumBalanceForRentExemption",
dto -> dto,
size);
}

private <T> Result<SolanaClientError, T> queryForObject(final TypeReference<RpcWrapperDTO<T>> type, final String method, final Object... params) throws SolanaJsonRpcClientException
// @Override
// public SolanaClientResponse<SimulateTransactionResponse> simulateTransaction(final String transaction) throws SolanaJsonRpcClientException
// {
// return queryForObject(
// new TypeReference<RpcWrapperDTO<SimulateTransactionResponseDTO>>()
// {
// },
// "simulateTransaction",
// SimulateTransactionResponseDTO::getValue,
// transaction,
// Map.of("encoding", "base64", "replaceRecentBlockhash", true));
// }

private <S, T> SolanaClientResponse<S> queryForObject(
final TypeReference<RpcWrapperDTO<T>> type,
final String method,
final Function<T, S> dtoMapper,
final Object... params) throws SolanaJsonRpcClientException
{
final HttpRequest request = prepareRequest(method, params);
final HttpResponse<String> httpResponse = sendRequest(request);

return decodeResponse(type, httpResponse);
final Result<SolanaClientError, T> response = decodeResponse(type, httpResponse);
if (response.isError())
{
return SolanaJsonRpcClientResponse.creatErrorResponse(response.getError());
}

return SolanaJsonRpcClientResponse.createSuccessResponse(dtoMapper.apply(response.getSuccess()));
}

private HttpRequest prepareRequest(final String method, final Object[] params) throws SolanaJsonRpcClientException
Expand Down
16 changes: 10 additions & 6 deletions client/src/main/java/com/lmax/solana4j/client/jsonrpc/SolanaJsonRpcClientResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,25 @@
import com.lmax.solana4j.client.api.SolanaClientError;
import com.lmax.solana4j.client.api.SolanaClientResponse;

class SolanaJsonRpcClientResponse<T> implements SolanaClientResponse<T>
final class SolanaJsonRpcClientResponse<T> implements SolanaClientResponse<T>
{
private final T response;
private final SolanaClientError error;

SolanaJsonRpcClientResponse(final T response)
private SolanaJsonRpcClientResponse(final T response, final SolanaClientError error)
{
this.response = response;
this.error = null;
this.error = error;
}

SolanaJsonRpcClientResponse(final SolanaClientError error)
static <T> SolanaClientResponse<T> createSuccessResponse(final T response)
{
this.response = null;
this.error = error;
return new SolanaJsonRpcClientResponse<>(response, null);
}

static <T> SolanaClientResponse<T> creatErrorResponse(final SolanaClientError error)
{
return new SolanaJsonRpcClientResponse<>(null, error);
}

@Override
Expand Down
9 changes: 9 additions & 0 deletions client/src/main/java/com/lmax/solana4j/client/jsonrpc/TransactionDetailLevel.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.lmax.solana4j.client.jsonrpc;

enum TransactionDetailLevel
{
FULL,
ACCOUNTS,
SIGNATURES,
NONE
}
2 changes: 1 addition & 1 deletion message-encoding/src/test-support/java/com/lmax/solana4j/SolanaNodeDsl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ public void setComputeUnits(final String... args)
else
{
assertThat(solanaClientResponse.isSuccess()).withFailMessage(
"We expected a succes but received a an error from the client."
"We expected a success but received a an error from the client."
).isTrue();
Waiter.waitFor(Condition.isNotNull(() -> solanaDriver.getTransactionResponse(solanaClientResponse.getResponse())));

Expand Down

0 comments on commit 677c778

Please sign in to comment.