Rename KeypairUtil to Signer (#8360) (#8366)

automerge

core/benches/banking_stage.rs

@@ -21,8 +21,8 @@ use solana_sdk::genesis_config::GenesisConfig;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Keypair;
-use solana_sdk::signature::KeypairUtil;
 use solana_sdk::signature::Signature;
+use solana_sdk::signature::Signer;
 use solana_sdk::system_instruction;
 use solana_sdk::system_transaction;
 use solana_sdk::timing::{duration_as_us, timestamp};

core/benches/poh_verify.rs

@@ -3,7 +3,7 @@ extern crate test;
 
 use solana_ledger::entry::{next_entry_mut, Entry, EntrySlice};
 use solana_sdk::hash::{hash, Hash};
-use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::system_transaction;
 use test::Bencher;
 

core/benches/shredder.rs

@@ -9,7 +9,7 @@ use solana_ledger::shred::{
 };
 use solana_perf::test_tx;
 use solana_sdk::hash::Hash;
-use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, Signer};
 use std::sync::Arc;
 use test::Bencher;
 

core/benches/sigverify_stage.rs

@@ -11,7 +11,7 @@ use solana_core::sigverify::TransactionSigVerifier;
 use solana_core::sigverify_stage::SigVerifyStage;
 use solana_perf::test_tx::test_tx;
 use solana_sdk::hash::Hash;
-use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::system_transaction;
 use solana_sdk::timing::duration_as_ms;
 use std::sync::mpsc::channel;

core/src/banking_stage.rs

@@ -1029,7 +1029,7 @@ mod tests {
     use solana_runtime::bank::HashAgeKind;
     use solana_sdk::{
         instruction::InstructionError,
-        signature::{Keypair, KeypairUtil},
+        signature::{Keypair, Signer},
         system_transaction,
         transaction::TransactionError,
     };

core/src/blockstream.rs

@@ -180,7 +180,7 @@ mod test {
     use chrono::{DateTime, FixedOffset};
     use serde_json::Value;
     use solana_sdk::hash::Hash;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use solana_sdk::system_transaction;
     use std::collections::HashSet;
     use std::path::PathBuf;

core/src/blockstream_service.rs

@@ -107,7 +107,7 @@ mod test {
     use solana_ledger::create_new_tmp_ledger;
     use solana_ledger::entry::{create_ticks, Entry};
     use solana_sdk::hash::Hash;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use solana_sdk::system_transaction;
     use std::path::PathBuf;
     use std::sync::mpsc::channel;

core/src/broadcast_stage.rs

@@ -259,7 +259,7 @@ mod test {
     use solana_runtime::bank::Bank;
     use solana_sdk::hash::Hash;
     use solana_sdk::pubkey::Pubkey;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use std::path::Path;
     use std::sync::atomic::AtomicBool;
     use std::sync::mpsc::channel;

core/src/broadcast_stage/standard_broadcast_run.rs

@@ -362,7 +362,7 @@ mod test {
     use solana_sdk::{
         clock::Slot,
         genesis_config::GenesisConfig,
-        signature::{Keypair, KeypairUtil},
+        signature::{Keypair, Signer},
     };
     use std::sync::{Arc, RwLock};
     use std::time::Duration;

core/src/cluster_info.rs

@@ -1888,7 +1888,7 @@ mod tests {
     use crate::crds_value::CrdsValueLabel;
     use rayon::prelude::*;
     use solana_perf::test_tx::test_tx;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use std::collections::HashSet;
     use std::net::{IpAddr, Ipv4Addr};
     use std::sync::{Arc, RwLock};

core/src/cluster_info_vote_listener.rs

@@ -84,7 +84,7 @@ impl ClusterInfoVoteListener {
 mod tests {
     use crate::packet;
     use solana_sdk::hash::Hash;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use solana_sdk::transaction::Transaction;
     use solana_vote_program::vote_instruction;
     use solana_vote_program::vote_state::Vote;

core/src/contact_info.rs

@@ -2,7 +2,7 @@ use solana_sdk::pubkey::Pubkey;
 #[cfg(test)]
 use solana_sdk::rpc_port;
 #[cfg(test)]
-use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::timing::timestamp;
 use std::cmp::{Ord, Ordering, PartialEq, PartialOrd};
 use std::net::{IpAddr, SocketAddr};

core/src/crds_value.rs

@@ -305,7 +305,7 @@ mod test {
     use crate::contact_info::ContactInfo;
     use bincode::deserialize;
     use solana_perf::test_tx::test_tx;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use solana_sdk::timing::timestamp;
 
     #[test]

core/src/gen_keys.rs

@@ -41,7 +41,7 @@ impl GenKeys {
 mod tests {
     use super::*;
     pub use solana_sdk::pubkey::Pubkey;
-    use solana_sdk::signature::KeypairUtil;
+    use solana_sdk::signature::Signer;
     use std::collections::HashSet;
 
     #[test]

core/src/gossip_service.rs

@@ -8,7 +8,7 @@ use solana_client::thin_client::{create_client, ThinClient};
 use solana_ledger::bank_forks::BankForks;
 use solana_perf::recycler::Recycler;
 use solana_sdk::pubkey::Pubkey;
-use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, Signer};
 use std::net::{SocketAddr, TcpListener, UdpSocket};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::channel;

core/src/replay_stage.rs

@@ -27,7 +27,7 @@ use solana_sdk::{
     clock::Slot,
     hash::Hash,
     pubkey::Pubkey,
-    signature::{Keypair, KeypairUtil},
+    signature::{Keypair, Signer},
     timing::{self, duration_as_ms},
     transaction::Transaction,
 };
@@ -1039,7 +1039,7 @@ pub(crate) mod tests {
         instruction::InstructionError,
         packet::PACKET_DATA_SIZE,
         rent::Rent,
-        signature::{Keypair, KeypairUtil, Signature},
+        signature::{Keypair, Signature, Signer},
         system_transaction,
         transaction::TransactionError,
     };

core/src/rpc.rs

@@ -1121,7 +1121,7 @@ pub mod tests {
         hash::{hash, Hash},
         instruction::InstructionError,
         rpc_port,
-        signature::{Keypair, KeypairUtil},
+        signature::{Keypair, Signer},
         system_transaction,
         transaction::TransactionError,
     };

core/src/rpc_pubsub.rs

@@ -288,7 +288,7 @@ mod tests {
     use solana_runtime::bank::Bank;
     use solana_sdk::{
         pubkey::Pubkey,
-        signature::{Keypair, KeypairUtil},
+        signature::{Keypair, Signer},
         system_program, system_transaction,
         transaction::{self, Transaction},
     };

core/src/rpc_service.rs

@@ -181,7 +181,7 @@ mod tests {
     };
     use solana_ledger::get_tmp_ledger_path;
     use solana_runtime::bank::Bank;
-    use solana_sdk::signature::KeypairUtil;
+    use solana_sdk::signature::Signer;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
     use std::sync::atomic::AtomicBool;
 

core/src/rpc_subscriptions.rs

@@ -506,7 +506,7 @@ pub(crate) mod tests {
     use jsonrpc_pubsub::typed::Subscriber;
     use solana_budget_program;
     use solana_sdk::{
-        signature::{Keypair, KeypairUtil},
+        signature::{Keypair, Signer},
         system_transaction,
     };
     use tokio::prelude::{Async, Stream};

core/src/serve_repair.rs

@@ -14,7 +14,7 @@ use solana_metrics::{datapoint_debug, inc_new_counter_debug};
 use solana_perf::packet::{Packets, PacketsRecycler};
 use solana_sdk::{
     clock::Slot,
-    signature::{Keypair, KeypairUtil},
+    signature::{Keypair, Signer},
     timing::duration_as_ms,
 };
 use std::{

core/src/sigverify_shreds.rs

@@ -76,7 +76,7 @@ pub mod tests {
     use crate::packet::Packet;
     use solana_ledger::shred::{Shred, Shredder};
     use solana_runtime::bank::Bank;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
 
     #[test]
     fn test_sigverify_shreds_read_slots() {

core/src/storage_stage.rs

@@ -20,7 +20,7 @@ use solana_sdk::{
     instruction::Instruction,
     message::Message,
     pubkey::Pubkey,
-    signature::{Keypair, KeypairUtil, Signature},
+    signature::{Keypair, Signature, Signer},
     transaction::Transaction,
 };
 use solana_storage_program::{
@@ -649,7 +649,7 @@ mod tests {
     use rayon::prelude::*;
     use solana_runtime::bank::Bank;
     use solana_sdk::hash::Hasher;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use std::cmp::{max, min};
     use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
     use std::sync::mpsc::channel;

core/src/tvu.rs

@@ -26,7 +26,7 @@ use solana_ledger::{
 };
 use solana_sdk::{
     pubkey::Pubkey,
-    signature::{Keypair, KeypairUtil},
+    signature::{Keypair, Signer},
 };
 use std::{
     net::UdpSocket,

core/src/validator.rs

@@ -40,7 +40,7 @@ use solana_sdk::{
     hash::Hash,
     poh_config::PohConfig,
     pubkey::Pubkey,
-    signature::{Keypair, KeypairUtil},
+    signature::{Keypair, Signer},
     timing::timestamp,
 };
 use std::{

core/src/window_service.rs

@@ -494,7 +494,7 @@ mod test {
         clock::Slot,
         epoch_schedule::MINIMUM_SLOTS_PER_EPOCH,
         hash::Hash,
-        signature::{Keypair, KeypairUtil},
+        signature::{Keypair, Signer},
     };
     use std::{
         net::UdpSocket,

core/tests/bank_forks.rs

@@ -23,7 +23,7 @@ mod tests {
         clock::Slot,
         hash::hashv,
         pubkey::Pubkey,
-        signature::{Keypair, KeypairUtil},
+        signature::{Keypair, Signer},
         system_transaction,
     };
     use std::sync::RwLock;

core/tests/client.rs

@@ -1,12 +1,13 @@
 use solana_client::rpc_client::RpcClient;
 use solana_core::validator::new_validator_for_tests;
-use solana_sdk::commitment_config::CommitmentConfig;
-use solana_sdk::pubkey::Pubkey;
-use solana_sdk::signature::KeypairUtil;
-use solana_sdk::system_transaction;
-use std::fs::remove_dir_all;
-use std::thread::sleep;
-use std::time::{Duration, Instant};
+use solana_sdk::{
+    commitment_config::CommitmentConfig, pubkey::Pubkey, signature::Signer, system_transaction,
+};
+use std::{
+    fs::remove_dir_all,
+    thread::sleep,
+    time::{Duration, Instant},
+};
 
 #[test]
 fn test_rpc_client() {

core/tests/gossip.rs

@@ -6,7 +6,7 @@ use solana_core::cluster_info::{ClusterInfo, Node};
 use solana_core::gossip_service::GossipService;
 
 use solana_core::packet::Packet;
-use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::timing::timestamp;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, Ordering};

core/tests/storage_stage.rs

@@ -15,7 +15,7 @@ mod tests {
     use solana_sdk::hash::Hash;
     use solana_sdk::message::Message;
     use solana_sdk::pubkey::Pubkey;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, Signer};
     use solana_sdk::transaction::Transaction;
     use solana_storage_program::storage_instruction;
     use solana_storage_program::storage_instruction::StorageAccountType;