From 0f8a871fc0cb84e1bc34b29cea1844bd4946a1ce Mon Sep 17 00:00:00 2001 From: Jon Cinque Date: Thu, 17 Aug 2023 19:05:30 +0200 Subject: [PATCH] client: Rename confrim -> confirm (#32861) * client: Rename confrim -> confirm * Rebase fix --- cli/src/program.rs | 4 ++-- ...llel.rs => send_and_confirm_transactions_in_parallel.rs} | 6 +++--- client/src/send_and_confirm_transactions_in_parallel.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename client-test/tests/{send_and_confrim_transactions_in_parallel.rs => send_and_confirm_transactions_in_parallel.rs} (98%) diff --git a/cli/src/program.rs b/cli/src/program.rs index a9acce30f8..51c8218c12 100644 --- a/cli/src/program.rs +++ b/cli/src/program.rs @@ -22,7 +22,7 @@ use { solana_client::{ connection_cache::ConnectionCache, send_and_confirm_transactions_in_parallel::{ - send_and_confirm_transactions_in_parallel_blocking, SendAndConfrimConfig, + send_and_confirm_transactions_in_parallel_blocking, SendAndConfirmConfig, }, tpu_client::{TpuClient, TpuClientConfig}, }, @@ -2198,7 +2198,7 @@ fn send_deploy_messages( Some(tpu_client), write_messages, &[payer_signer, write_signer], - SendAndConfrimConfig { + SendAndConfirmConfig { resign_txs_count: Some(5), with_spinner: true, }, diff --git a/client-test/tests/send_and_confrim_transactions_in_parallel.rs b/client-test/tests/send_and_confirm_transactions_in_parallel.rs similarity index 98% rename from client-test/tests/send_and_confrim_transactions_in_parallel.rs rename to client-test/tests/send_and_confirm_transactions_in_parallel.rs index a2ee3291f4..44f8738983 100644 --- a/client-test/tests/send_and_confrim_transactions_in_parallel.rs +++ b/client-test/tests/send_and_confirm_transactions_in_parallel.rs @@ -2,7 +2,7 @@ use { solana_client::{ nonblocking::tpu_client::TpuClient, send_and_confirm_transactions_in_parallel::{ - send_and_confirm_transactions_in_parallel_blocking, SendAndConfrimConfig, + send_and_confirm_transactions_in_parallel_blocking, SendAndConfirmConfig, }, }, solana_rpc_client::rpc_client::RpcClient, @@ -56,7 +56,7 @@ fn test_send_and_confirm_transactions_in_parallel_without_tpu_client() { None, &messages, &[&alice], - SendAndConfrimConfig { + SendAndConfirmConfig { with_spinner: false, resign_txs_count: Some(5), }, @@ -114,7 +114,7 @@ fn test_send_and_confirm_transactions_in_parallel_with_tpu_client() { Some(tpu_client), &messages, &[&alice], - SendAndConfrimConfig { + SendAndConfirmConfig { with_spinner: false, resign_txs_count: Some(5), }, diff --git a/client/src/send_and_confirm_transactions_in_parallel.rs b/client/src/send_and_confirm_transactions_in_parallel.rs index bab0cc6054..322d9e4a83 100644 --- a/client/src/send_and_confirm_transactions_in_parallel.rs +++ b/client/src/send_and_confirm_transactions_in_parallel.rs @@ -51,7 +51,7 @@ struct BlockHashData { } #[derive(Clone, Debug, Copy)] -pub struct SendAndConfrimConfig { +pub struct SendAndConfirmConfig { pub with_spinner: bool, pub resign_txs_count: Option, } @@ -61,7 +61,7 @@ pub fn send_and_confirm_transactions_in_parallel_blocking( tpu_client: Option, messages: &[Message], signers: &T, - config: SendAndConfrimConfig, + config: SendAndConfirmConfig, ) -> Result>> { let fut = send_and_confirm_transactions_in_parallel( rpc_client.get_inner_client().clone(), @@ -352,7 +352,7 @@ pub async fn send_and_confirm_transactions_in_parallel( tpu_client: Option, messages: &[Message], signers: &T, - config: SendAndConfrimConfig, + config: SendAndConfirmConfig, ) -> Result>> { // get current blockhash and corresponding last valid block height let (blockhash, last_valid_blockheight) = rpc_client