Rename KeypairUtil to Signer (#8360)

automerge

cli/src/cli.rs

@@ -36,7 +36,7 @@ use solana_sdk::{
     native_token::lamports_to_sol,
     program_utils::DecodeError,
     pubkey::Pubkey,
-    signature::{keypair_from_seed, Keypair, KeypairUtil, Signature},
+    signature::{keypair_from_seed, Keypair, Signature, Signer},
     system_instruction::{self, create_address_with_seed, SystemError, MAX_ADDRESS_SEED_LEN},
     system_transaction,
     transaction::{Transaction, TransactionError},
@@ -1974,7 +1974,7 @@ impl FaucetKeypair {
     }
 }
 
-impl KeypairUtil for FaucetKeypair {
+impl Signer for FaucetKeypair {
     /// Return the public key of the keypair used to sign votes
     fn pubkey(&self) -> Pubkey {
         self.transaction.message().account_keys[0]

cli/src/cluster_query.rs

@@ -21,7 +21,7 @@ use solana_sdk::{
     epoch_schedule::Epoch,
     hash::Hash,
     pubkey::Pubkey,
-    signature::{Keypair, KeypairUtil},
+    signature::{Keypair, Signer},
     system_transaction,
 };
 use std::{

cli/src/nonce.rs

@@ -13,7 +13,7 @@ use solana_sdk::{
     hash::Hash,
     nonce_state::{Meta, NonceState},
     pubkey::Pubkey,
-    signature::{Keypair, KeypairUtil},
+    signature::{Keypair, Signer},
     system_instruction::{
         advance_nonce_account, authorize_nonce_account, create_address_with_seed,
         create_nonce_account, create_nonce_account_with_seed, withdraw_nonce_account, NonceError,

cli/src/stake.rs

@@ -16,7 +16,7 @@ use solana_sdk::signature::{Keypair, Signature};
 use solana_sdk::{
     account_utils::StateMut,
     pubkey::Pubkey,
-    signature::KeypairUtil,
+    signature::Signer,
     system_instruction::{create_address_with_seed, SystemError},
     sysvar::{
         stake_history::{self, StakeHistory},
@@ -1499,7 +1499,7 @@ mod tests {
     use solana_sdk::{
         fee_calculator::FeeCalculator,
         hash::Hash,
-        signature::{keypair_from_seed, read_keypair_file, write_keypair, KeypairUtil},
+        signature::{keypair_from_seed, read_keypair_file, write_keypair, Signer},
     };
     use tempfile::NamedTempFile;
 

cli/src/storage.rs

@@ -7,7 +7,7 @@ use solana_clap_utils::{input_parsers::*, input_validators::*};
 use solana_client::rpc_client::RpcClient;
 use solana_sdk::signature::Keypair;
 use solana_sdk::{
-    account_utils::StateMut, message::Message, pubkey::Pubkey, signature::KeypairUtil,
+    account_utils::StateMut, message::Message, pubkey::Pubkey, signature::Signer,
     system_instruction::SystemError, transaction::Transaction,
 };
 use solana_storage_program::storage_instruction::{self, StorageAccountType};

cli/src/validator_info.rs

@@ -19,7 +19,7 @@ use solana_sdk::{
     commitment_config::CommitmentConfig,
     message::Message,
     pubkey::Pubkey,
-    signature::{Keypair, KeypairUtil},
+    signature::{Keypair, Signer},
     transaction::Transaction,
 };
 use std::error;

cli/src/vote.rs

@@ -9,7 +9,7 @@ use solana_sdk::{
     account::Account,
     pubkey::Pubkey,
     signature::Keypair,
-    signature::KeypairUtil,
+    signature::Signer,
     system_instruction::{create_address_with_seed, SystemError},
     transaction::Transaction,
 };

cli/tests/nonce.rs

@@ -6,7 +6,7 @@ use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     hash::Hash,
     pubkey::Pubkey,
-    signature::{read_keypair_file, write_keypair, Keypair, KeypairUtil},
+    signature::{read_keypair_file, write_keypair, Keypair, Signer},
     system_instruction::create_address_with_seed,
     system_program,
 };

cli/tests/pay.rs

@@ -11,7 +11,7 @@ use solana_sdk::{
     fee_calculator::FeeCalculator,
     nonce_state::NonceState,
     pubkey::Pubkey,
-    signature::{read_keypair_file, write_keypair, Keypair, KeypairUtil},
+    signature::{read_keypair_file, write_keypair, Keypair, Signer},
 };
 use std::fs::remove_dir_all;
 use std::sync::mpsc::channel;

cli/tests/request_airdrop.rs

@@ -2,7 +2,7 @@ use solana_cli::cli::{process_command, CliCommand, CliConfig};
 use solana_client::rpc_client::RpcClient;
 use solana_core::validator::new_validator_for_tests;
 use solana_faucet::faucet::run_local_faucet;
-use solana_sdk::signature::KeypairUtil;
+use solana_sdk::signature::Signer;
 use std::fs::remove_dir_all;
 use std::sync::mpsc::channel;
 

cli/tests/stake.rs

@@ -9,7 +9,7 @@ use solana_sdk::{
     fee_calculator::FeeCalculator,
     nonce_state::NonceState,
     pubkey::Pubkey,
-    signature::{keypair_from_seed, read_keypair_file, write_keypair, Keypair, KeypairUtil},
+    signature::{keypair_from_seed, read_keypair_file, write_keypair, Keypair, Signer},
     system_instruction::create_address_with_seed,
 };
 use solana_stake_program::stake_state::{Lockup, StakeAuthorize, StakeState};

cli/tests/transfer.rs

@@ -9,7 +9,7 @@ use solana_sdk::{
     fee_calculator::FeeCalculator,
     nonce_state::NonceState,
     pubkey::Pubkey,
-    signature::{keypair_from_seed, read_keypair_file, write_keypair, KeypairUtil},
+    signature::{keypair_from_seed, read_keypair_file, write_keypair, Signer},
 };
 use std::fs::remove_dir_all;
 use std::sync::mpsc::channel;