blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

client: Rename confrim -> confirm (#32861) 

* client: Rename confrim -> confirm

* Rebase fix
This commit is contained in:
Jon Cinque 2023-08-17 19:05:30 +02:00 committed by GitHub
parent fea546010e
commit 0f8a871fc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/program.rs
View File

@ -22,7 +22,7 @@ use {
solana_client::{ solana_client::{
connection_cache::ConnectionCache, connection_cache::ConnectionCache,
send_and_confirm_transactions_in_parallel::{ 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}, tpu_client::{TpuClient, TpuClientConfig},
}, },
@ -2198,7 +2198,7 @@ fn send_deploy_messages(
Some(tpu_client), Some(tpu_client),
write_messages, write_messages,
&[payer_signer, write_signer], &[payer_signer, write_signer],
SendAndConfrimConfig { SendAndConfirmConfig {
resign_txs_count: Some(5), resign_txs_count: Some(5),
with_spinner: true, with_spinner: true,
}, },

6
client-test/tests/send_and_confrim_transactions_in_parallel.rs → client-test/tests/send_and_confirm_transactions_in_parallel.rs
View File

@ -2,7 +2,7 @@ use {
solana_client::{ solana_client::{
nonblocking::tpu_client::TpuClient, nonblocking::tpu_client::TpuClient,
send_and_confirm_transactions_in_parallel::{ 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, solana_rpc_client::rpc_client::RpcClient,
@ -56,7 +56,7 @@ fn test_send_and_confirm_transactions_in_parallel_without_tpu_client() {
None, None,
&messages, &messages,
&[&alice], &[&alice],
SendAndConfrimConfig { SendAndConfirmConfig {
with_spinner: false, with_spinner: false,
resign_txs_count: Some(5), resign_txs_count: Some(5),
}, },
@ -114,7 +114,7 @@ fn test_send_and_confirm_transactions_in_parallel_with_tpu_client() {
Some(tpu_client), Some(tpu_client),
&messages, &messages,
&[&alice], &[&alice],
SendAndConfrimConfig { SendAndConfirmConfig {
with_spinner: false, with_spinner: false,
resign_txs_count: Some(5), resign_txs_count: Some(5),
}, },

6
client/src/send_and_confirm_transactions_in_parallel.rs
View File

@ -51,7 +51,7 @@ struct BlockHashData {
} }
#[derive(Clone, Debug, Copy)] #[derive(Clone, Debug, Copy)]
pub struct SendAndConfrimConfig { pub struct SendAndConfirmConfig {
pub with_spinner: bool, pub with_spinner: bool,
pub resign_txs_count: Option<usize>, pub resign_txs_count: Option<usize>,
} }
@ -61,7 +61,7 @@ pub fn send_and_confirm_transactions_in_parallel_blocking<T: Signers + ?Sized>(
tpu_client: Option<QuicTpuClient>, tpu_client: Option<QuicTpuClient>,
messages: &[Message], messages: &[Message],
signers: &T, signers: &T,
config: SendAndConfrimConfig, config: SendAndConfirmConfig,
) -> Result<Vec<Option<TransactionError>>> { ) -> Result<Vec<Option<TransactionError>>> {
let fut = send_and_confirm_transactions_in_parallel( let fut = send_and_confirm_transactions_in_parallel(
rpc_client.get_inner_client().clone(), rpc_client.get_inner_client().clone(),
@ -352,7 +352,7 @@ pub async fn send_and_confirm_transactions_in_parallel<T: Signers + ?Sized>(
tpu_client: Option<QuicTpuClient>, tpu_client: Option<QuicTpuClient>,
messages: &[Message], messages: &[Message],
signers: &T, signers: &T,
config: SendAndConfrimConfig, config: SendAndConfirmConfig,
) -> Result<Vec<Option<TransactionError>>> { ) -> Result<Vec<Option<TransactionError>>> {
// get current blockhash and corresponding last valid block height // get current blockhash and corresponding last valid block height
let (blockhash, last_valid_blockheight) = rpc_client let (blockhash, last_valid_blockheight) = rpc_client