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

Use status.satisfies_commitment

This commit is contained in:
Michael Vines 2021-09-16 18:02:09 -07:00
parent b5d75510f6
commit 7d1c0c48fb
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
token/cli/src/rpc_client_utils.rs
View File

@ -13,7 +13,6 @@ use {
signers::Signers, signers::Signers,
transaction::{Transaction, TransactionError}, transaction::{Transaction, TransactionError},
}, },
solana_transaction_status::TransactionConfirmationStatus,
std::{ std::{
collections::HashMap, collections::HashMap,
error, error,
@ -156,17 +155,7 @@ pub fn send_and_confirm_messages_with_spinner<T: Signers>(
pending_signatures_chunk.iter().zip(statuses.into_iter()) pending_signatures_chunk.iter().zip(statuses.into_iter())
{ {
if let Some(status) = status { if let Some(status) = status {
if let Some(confirmation_status) = &status.confirmation_status { if status.satisfies_commitment(rpc_client.commitment()) {
if *confirmation_status != TransactionConfirmationStatus::Processed
{
if let Some((i, _)) = pending_transactions.remove(signature) {
confirmed_transactions += 1;
transaction_errors[i] = status.err;
}
}
} else if status.confirmations.is_none()
|| status.confirmations.unwrap() > 1
{
if let Some((i, _)) = pending_transactions.remove(signature) { if let Some((i, _)) = pending_transactions.remove(signature) {
confirmed_transactions += 1; confirmed_transactions += 1;
transaction_errors[i] = status.err; transaction_errors[i] = status.err;