Rename Client methods to match proposed BanksClient (#10793)

stake-accounts/src/main.rs

@@ -83,7 +83,7 @@ fn process_new_stake_account(
         &*args.funding_keypair,
         &*args.base_keypair,
     ]);
-    let signature = send_message(client, message, &signers, false)?;
+    let signature = send_and_confirm_message(client, message, &signers, false)?;
     Ok(signature)
 }
 
@@ -105,7 +105,7 @@ fn process_authorize_stake_accounts(
         &*args.stake_authority,
         &*args.withdraw_authority,
     ]);
-    send_messages(client, messages, &signers, false)?;
+    send_and_confirm_messages(client, messages, &signers, false)?;
     Ok(())
 }
 
@@ -134,7 +134,7 @@ fn process_lockup_stake_accounts(
         return Ok(());
     }
     let signers = unique_signers(vec![&*args.fee_payer, &*args.custodian]);
-    send_messages(client, messages, &signers, args.no_wait)?;
+    send_and_confirm_messages(client, messages, &signers, args.no_wait)?;
     Ok(())
 }
 
@@ -161,7 +161,7 @@ fn process_rebase_stake_accounts(
         &*args.new_base_keypair,
         &*args.stake_authority,
     ]);
-    send_messages(client, messages, &signers, false)?;
+    send_and_confirm_messages(client, messages, &signers, false)?;
     Ok(())
 }
 
@@ -194,11 +194,11 @@ fn process_move_stake_accounts(
         &*args.stake_authority,
         &*authorize_args.withdraw_authority,
     ]);
-    send_messages(client, messages, &signers, false)?;
+    send_and_confirm_messages(client, messages, &signers, false)?;
     Ok(())
 }
 
-fn send_message<S: Signers>(
+fn send_and_confirm_message<S: Signers>(
     client: &RpcClient,
     message: Message,
     signers: &S,
@@ -217,7 +217,7 @@ fn send_message<S: Signers>(
     }
 }
 
-fn send_messages<S: Signers>(
+fn send_and_confirm_messages<S: Signers>(
     client: &RpcClient,
     messages: Vec<Message>,
     signers: &S,
@@ -225,7 +225,7 @@ fn send_messages<S: Signers>(
 ) -> Result<Vec<Signature>, ClientError> {
     let mut signatures = vec![];
     for message in messages {
-        let signature = send_message(client, message, signers, no_wait)?;
+        let signature = send_and_confirm_message(client, message, signers, no_wait)?;
         signatures.push(signature);
         println!("{}", signature);
     }

stake-accounts/src/stake_accounts.rs

@@ -299,7 +299,7 @@ mod tests {
     ) -> Keypair {
         let fee_payer_keypair = Keypair::new();
         client
-            .transfer(lamports, &funding_keypair, &fee_payer_keypair.pubkey())
+            .transfer_and_confirm(lamports, &funding_keypair, &fee_payer_keypair.pubkey())
             .unwrap();
         fee_payer_keypair
     }
@@ -362,7 +362,9 @@ mod tests {
         );
 
         let signers = [&funding_keypair, &fee_payer_keypair, &base_keypair];
-        bank_client.send_message(&signers, message).unwrap();
+        bank_client
+            .send_and_confirm_message(&signers, message)
+            .unwrap();
 
         let account = get_account_at(&bank_client, &base_pubkey, 0);
         assert_eq!(account.lamports, lamports);
@@ -400,7 +402,9 @@ mod tests {
         );
 
         let signers = [&funding_keypair, &fee_payer_keypair, &base_keypair];
-        bank_client.send_message(&signers, message).unwrap();
+        bank_client
+            .send_and_confirm_message(&signers, message)
+            .unwrap();
 
         let new_stake_authority_pubkey = Pubkey::new_rand();
         let new_withdraw_authority_pubkey = Pubkey::new_rand();
@@ -420,7 +424,9 @@ mod tests {
             &withdraw_authority_keypair,
         ];
         for message in messages {
-            bank_client.send_message(&signers, message).unwrap();
+            bank_client
+                .send_and_confirm_message(&signers, message)
+                .unwrap();
         }
 
         let account = get_account_at(&bank_client, &base_pubkey, 0);
@@ -456,7 +462,9 @@ mod tests {
         );
 
         let signers = [&funding_keypair, &fee_payer_keypair, &base_keypair];
-        bank_client.send_message(&signers, message).unwrap();
+        bank_client
+            .send_and_confirm_message(&signers, message)
+            .unwrap();
 
         let lockups = get_lockups(&bank_client, &base_pubkey, 1);
         let messages = lockup_stake_accounts(
@@ -472,7 +480,9 @@ mod tests {
 
         let signers = [&fee_payer_keypair, &custodian_keypair];
         for message in messages {
-            bank_client.send_message(&signers, message).unwrap();
+            bank_client
+                .send_and_confirm_message(&signers, message)
+                .unwrap();
         }
 
         let account = get_account_at(&bank_client, &base_pubkey, 0);
@@ -541,7 +551,9 @@ mod tests {
         );
 
         let signers = [&funding_keypair, &fee_payer_keypair, &base_keypair];
-        bank_client.send_message(&signers, message).unwrap();
+        bank_client
+            .send_and_confirm_message(&signers, message)
+            .unwrap();
 
         let new_base_keypair = Keypair::new();
         let new_base_pubkey = new_base_keypair.pubkey();
@@ -560,7 +572,9 @@ mod tests {
             &stake_authority_keypair,
         ];
         for message in messages {
-            bank_client.send_message(&signers, message).unwrap();
+            bank_client
+                .send_and_confirm_message(&signers, message)
+                .unwrap();
         }
 
         // Ensure the new accounts are duplicates of the previous ones.
@@ -600,7 +614,9 @@ mod tests {
         );
 
         let signers = [&funding_keypair, &fee_payer_keypair, &base_keypair];
-        bank_client.send_message(&signers, message).unwrap();
+        bank_client
+            .send_and_confirm_message(&signers, message)
+            .unwrap();
 
         let new_base_keypair = Keypair::new();
         let new_base_pubkey = new_base_keypair.pubkey();
@@ -625,7 +641,9 @@ mod tests {
             &withdraw_authority_keypair,
         ];
         for message in messages {
-            bank_client.send_message(&signers, message).unwrap();
+            bank_client
+                .send_and_confirm_message(&signers, message)
+                .unwrap();
         }
 
         // Ensure the new accounts have the new authorities.