Rename Client methods to match proposed BanksClient (bp #10793) (#10800)

* Rename Client methods to match proposed BanksClient (#10793)

(cherry picked from commit 7ade330b23)

# Conflicts:
#	programs/bpf/tests/programs.rs
#	runtime/benches/bank.rs

* Fix merge

Co-authored-by: Greg Fitzgerald <greg@solana.com>

tokens/src/commands.rs

@@ -159,7 +159,7 @@ fn distribute_tokens<T: Client>(
 
         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,
@@ -513,7 +513,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 {

tokens/src/thin_client.rs

@@ -145,7 +145,7 @@ impl<C: Client> ThinClient<C> {
         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,
@@ -169,7 +169,7 @@ impl<C: Client> ThinClient<C> {
         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)> {