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

Add missing versioned tx support to BanksClient (#30958) 

* replace Transaction params with impl Into<VersionedTransaction>

* replace Vec<Transaction> with Vec<T>

* fmt
This commit is contained in:
Kevin Heavey 2023-03-29 21:47:25 +01:00 committed by GitHub
parent 4b7cfa23c1
commit 7c6572d5ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
banks-client/src/lib.rs
View File

@ -25,7 +25,7 @@ use {
commitment_config::CommitmentLevel,
message::Message,
signature::Signature,
transaction::{self, Transaction, VersionedTransaction},
transaction::{self, VersionedTransaction},
},
tarpc::{
client::{self, NewClient, RequestDispatch},
@ -231,7 +231,7 @@ impl BanksClient {
/// reached the given level of commitment.
pub fn process_transaction_with_commitment(
&mut self,
transaction: Transaction,
transaction: impl Into<VersionedTransaction>,
commitment: CommitmentLevel,
) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
let ctx = context::current();
@ -258,7 +258,7 @@ impl BanksClient {
/// after the transaction has been rejected or reached the given level of commitment.
pub fn process_transaction_with_preflight_and_commitment(
&mut self,
transaction: Transaction,
transaction: impl Into<VersionedTransaction>,
commitment: CommitmentLevel,
) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
let ctx = context::current();
@ -294,7 +294,7 @@ impl BanksClient {
/// after the transaction has been finalized or rejected.
pub fn process_transaction_with_preflight(
&mut self,
transaction: Transaction,
transaction: impl Into<VersionedTransaction>,
) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
self.process_transaction_with_preflight_and_commitment(
transaction,
@ -305,14 +305,14 @@ impl BanksClient {
/// Send a transaction and return until the transaction has been finalized or rejected.
pub fn process_transaction(
&mut self,
transaction: Transaction,
transaction: impl Into<VersionedTransaction>,
) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
self.process_transaction_with_commitment(transaction, CommitmentLevel::default())
}
pub async fn process_transactions_with_commitment(
pub async fn process_transactions_with_commitment<T: Into<VersionedTransaction>>(
&mut self,
transactions: Vec<Transaction>,
transactions: Vec<T>,
commitment: CommitmentLevel,
) -> Result<(), BanksClientError> {
let mut clients: Vec<_> = transactions.iter().map(|_| self.clone()).collect();
@ -327,9 +327,9 @@ impl BanksClient {
}
/// Send transactions and return until the transaction has been finalized or rejected.
pub fn process_transactions(
&mut self,
transactions: Vec<Transaction>,
pub fn process_transactions<'a, T: Into<VersionedTransaction> + 'a>(
&'a mut self,
transactions: Vec<T>,
) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
self.process_transactions_with_commitment(transactions, CommitmentLevel::default())
}
@ -337,7 +337,7 @@ impl BanksClient {
/// Simulate a transaction at the given commitment level
pub fn simulate_transaction_with_commitment(
&mut self,
transaction: Transaction,
transaction: impl Into<VersionedTransaction>,
commitment: CommitmentLevel,
) -> impl Future<Output = Result<BanksTransactionResultWithSimulation, BanksClientError>> + '_
{
@ -351,7 +351,7 @@ impl BanksClient {
/// Simulate a transaction at the default commitment level
pub fn simulate_transaction(
&mut self,
transaction: Transaction,
transaction: impl Into<VersionedTransaction>,
) -> impl Future<Output = Result<BanksTransactionResultWithSimulation, BanksClientError>> + '_
{
self.simulate_transaction_with_commitment(transaction, CommitmentLevel::default())
@ -534,7 +534,9 @@ mod tests {
bank::Bank, bank_forks::BankForks, commitment::BlockCommitmentCache,
genesis_utils::create_genesis_config,
},
solana_sdk::{message::Message, signature::Signer, system_instruction},
solana_sdk::{
message::Message, signature::Signer, system_instruction, transaction::Transaction,
},
std::sync::{Arc, RwLock},
tarpc::transport,
tokio::{