Skip to content

test: use default commitment for client in solana_test_validator.rs #97

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

Merged
lpahlavi merged 3 commits into from
May 9, 2025
Merged

test: use default commitment for client in solana_test_validator.rs #97

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a6d02e
XC-291: Simplify commitment level params
lpahlavi May 9, 2025
ec6e621
XC-291: Clippy
lpahlavi May 9, 2025
16b4292
XC-291: Revert change
lpahlavi May 9, 2025
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
25 changes: 7 additions & 18 deletions integration_tests/tests/solana_test_validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use sol_rpc_client::SolRpcClient;
use sol_rpc_int_tests::{spl, PocketIcLiveModeRuntime};
use sol_rpc_types::{
CommitmentLevel, GetAccountInfoEncoding, GetAccountInfoParams, GetBlockCommitmentLevel,
GetBlockParams, GetSlotParams, GetTransactionEncoding, GetTransactionParams, InstallArgs,
Lamport, OverrideProvider, RegexSubstitution, SendTransactionParams, TransactionDetails,
GetBlockParams, GetTransactionEncoding, GetTransactionParams, InstallArgs, Lamport,
OverrideProvider, RegexSubstitution, TransactionDetails,
};
use solana_account_decoder_client_types::{token::UiTokenAmount, UiAccount};
use solana_client::rpc_client::{RpcClient as SolanaRpcClient, RpcClient};
Expand Down Expand Up @@ -45,10 +45,6 @@ async fn should_get_slot() {
|sol| sol.get_slot().expect("Failed to get slot"),
|ic| async move {
ic.get_slot()
.with_params(GetSlotParams {
commitment: Some(CommitmentLevel::Confirmed),
..GetSlotParams::default()
})
.send()
.await
.expect_consistent()
Expand Down Expand Up @@ -199,7 +195,6 @@ async fn should_get_transaction() {
|ic| async move {
let mut params: GetTransactionParams = signature.into();
params.encoding = Some(GetTransactionEncoding::Base64);
params.commitment = Some(CommitmentLevel::Confirmed);
ic.get_transaction(params)
.send()
.await
Expand Down Expand Up @@ -249,13 +244,10 @@ async fn should_send_transaction() {
blockhash,
);

let mut params: SendTransactionParams = transaction.clone().try_into().unwrap();
params.preflight_commitment = Some(CommitmentLevel::Confirmed);

// Don't compare the result to the Solana validator since a transaction can only be submitted once.
let transaction_id = setup
.icp_client()
.send_transaction(params)
.send_transaction(transaction)
.send()
.await
.expect_consistent()
Expand Down Expand Up @@ -286,9 +278,6 @@ async fn should_get_balance() {
|sol| sol.get_balance(&account).expect("Failed to get balance"),
|ic| async move {
ic.get_balance(pubkey)
.modify_params(|params| {
params.commitment = Some(CommitmentLevel::Confirmed)
})
.send()
.await
.expect_consistent()
Expand Down Expand Up @@ -327,9 +316,6 @@ async fn should_get_token_account_balance() {
},
|ic| async move {
ic.get_token_account_balance(pubkey)
.modify_params(|params| {
params.commitment = Some(CommitmentLevel::Confirmed)
})
.send()
.await
.expect_consistent()
Expand Down Expand Up @@ -431,7 +417,10 @@ impl Setup {
}

fn icp_client(&self) -> SolRpcClient<PocketIcLiveModeRuntime> {
self.setup.client_live_mode().build()
self.setup
.client_live_mode()
.with_default_commitment_level(CommitmentLevel::Confirmed)
.build()
}

async fn compare_client<'a, Sol, SolOutput, Icp, IcpOutput, Fut>(
Expand Down