gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename Client methods to match proposed BanksClient (#10793)

Browse Source
This commit is contained in:
Greg Fitzgerald
2020-06-24 21:35:38 -06:00
committed by GitHub
parent ea708b0d84
commit 7ade330b23
23 changed files with 210 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tokens/src/commands.rs
View File

@ -159,7 +159,7 @@ fn distribute_tokens(
let fee_payer_pubkey = args.fee_payer.pubkey();
let message = Message::new(&instructions, Some(&fee_payer_pubkey));
match client.send_message(message, &signers) {
match client.send_and_confirm_message(message, &signers) {
Ok((transaction, last_valid_slot)) => {
db::set_transaction_info(
db,
@ -510,7 +510,9 @@ pub fn test_process_distribute_stake_with_client<C: Client>(client: C, sender_ke
);
let message = Message::new(&instructions, Some(&sender_keypair.pubkey()));
let signers = [&sender_keypair, &stake_account_keypair];
thin_client.send_message(message, &signers).unwrap();
thin_client
.send_and_confirm_message(message, &signers)
.unwrap();
let alice_pubkey = Pubkey::new_rand();
let allocation = Allocation {

4
tokens/src/thin_client.rs
View File

@ -148,7 +148,7 @@ impl<'a> ThinClient<'a> {
self.client.get_signature_statuses1(signatures)
}
pub fn send_message<S: Signers>(
pub fn send_and_confirm_message<S: Signers>(
&self,
message: Message,
signers: &S,
@ -172,7 +172,7 @@ impl<'a> ThinClient<'a> {
let create_instruction =
system_instruction::transfer(&sender_keypair.pubkey(), &to_pubkey, lamports);
let message = Message::new(&[create_instruction], Some(&sender_keypair.pubkey()));
self.send_message(message, &[sender_keypair])
self.send_and_confirm_message(message, &[sender_keypair])
}
pub fn get_fees(&self) -> Result<(Hash, FeeCalculator, Slot)> {