From bff820d549ce98edf6af9c02c258a60dc0dcd866 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 21 Oct 2020 18:07:17 -0700
Subject: [PATCH] Remove unused pubkey::Pubkey imports

---
 account-decoder/src/parse_stake.rs                    | 1 -
 banking-bench/src/main.rs                             | 1 -
 banks-client/src/lib.rs                               | 2 +-
 cli/tests/vote.rs                                     | 1 -
 core/benches/banking_stage.rs                         | 1 -
 core/benches/cluster_info.rs                          | 1 -
 core/benches/crds_gossip_pull.rs                      | 1 -
 core/benches/crds_shards.rs                           | 1 -
 core/benches/retransmit_stage.rs                      | 1 -
 core/src/broadcast_stage/broadcast_fake_shreds_run.rs | 1 -
 core/src/crds_shards.rs                               | 1 -
 core/src/retransmit_stage.rs                          | 1 -
 core/src/verified_vote_packets.rs                     | 1 -
 core/tests/client.rs                                  | 3 +--
 core/tests/rpc.rs                                     | 4 ++--
 dos/src/main.rs                                       | 1 -
 faucet/tests/local-faucet.rs                          | 1 -
 genesis/src/main.rs                                   | 1 -
 ledger/src/genesis_utils.rs                           | 1 -
 local-cluster/tests/local_cluster.rs                  | 1 -
 programs/failure/tests/failure.rs                     | 1 -
 runtime/benches/accounts_index.rs                     | 1 -
 runtime/benches/message_processor.rs                  | 2 +-
 runtime/src/transaction_batch.rs                      | 2 +-
 runtime/tests/bank.rs                                 | 2 +-
 runtime/tests/noop.rs                                 | 4 +---
 sdk/benches/serialize_instructions.rs                 | 1 -
 storage-bigtable/src/bigtable.rs                      | 2 +-
 transaction-status/src/parse_accounts.rs              | 2 +-
 transaction-status/src/parse_bpf_loader.rs            | 2 +-
 30 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/account-decoder/src/parse_stake.rs b/account-decoder/src/parse_stake.rs
index 557a6e54ce..86dc88e80a 100644
--- a/account-decoder/src/parse_stake.rs
+++ b/account-decoder/src/parse_stake.rs
@@ -134,7 +134,6 @@ impl From<Delegation> for UiDelegation {
 mod test {
     use super::*;
     use bincode::serialize;
-    use solana_sdk::pubkey::Pubkey;
 
     #[test]
     fn test_parse_stake() {
diff --git a/banking-bench/src/main.rs b/banking-bench/src/main.rs
index 4e54b8f378..67b61a8fd3 100644
--- a/banking-bench/src/main.rs
+++ b/banking-bench/src/main.rs
@@ -20,7 +20,6 @@ use solana_perf::packet::to_packets_chunked;
 use solana_runtime::{bank::Bank, bank_forks::BankForks};
 use solana_sdk::{
     hash::Hash,
-    pubkey::Pubkey,
     signature::Keypair,
     signature::Signature,
     system_transaction,
diff --git a/banks-client/src/lib.rs b/banks-client/src/lib.rs
index b8834b757b..e392b6a7a6 100644
--- a/banks-client/src/lib.rs
+++ b/banks-client/src/lib.rs
@@ -213,7 +213,7 @@ mod tests {
     use super::*;
     use solana_banks_server::banks_server::start_local_server;
     use solana_runtime::{bank::Bank, bank_forks::BankForks, genesis_utils::create_genesis_config};
-    use solana_sdk::{message::Message, pubkey::Pubkey, signature::Signer, system_instruction};
+    use solana_sdk::{message::Message, signature::Signer, system_instruction};
     use std::sync::{Arc, RwLock};
     use tarpc::transport;
     use tokio::{runtime::Runtime, time::delay_for};
diff --git a/cli/tests/vote.rs b/cli/tests/vote.rs
index 0d23a78f2d..0bcf668310 100644
--- a/cli/tests/vote.rs
+++ b/cli/tests/vote.rs
@@ -12,7 +12,6 @@ use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
     commitment_config::CommitmentConfig,
-    pubkey::Pubkey,
     signature::{Keypair, Signer},
 };
 use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
diff --git a/core/benches/banking_stage.rs b/core/benches/banking_stage.rs
index cbc6da3ece..d2acd80016 100644
--- a/core/benches/banking_stage.rs
+++ b/core/benches/banking_stage.rs
@@ -20,7 +20,6 @@ use solana_runtime::bank::Bank;
 use solana_sdk::genesis_config::GenesisConfig;
 use solana_sdk::hash::Hash;
 use solana_sdk::message::Message;
-use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Keypair;
 use solana_sdk::signature::Signature;
 use solana_sdk::signature::Signer;
diff --git a/core/benches/cluster_info.rs b/core/benches/cluster_info.rs
index 42a32d2cdb..8a5aa92676 100644
--- a/core/benches/cluster_info.rs
+++ b/core/benches/cluster_info.rs
@@ -8,7 +8,6 @@ use solana_core::broadcast_stage::{broadcast_shreds, get_broadcast_peers};
 use solana_core::cluster_info::{ClusterInfo, Node};
 use solana_core::contact_info::ContactInfo;
 use solana_ledger::shred::Shred;
-use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::timestamp;
 use std::{
     collections::HashMap,
diff --git a/core/benches/crds_gossip_pull.rs b/core/benches/crds_gossip_pull.rs
index c0b64eaf8c..38fa3cb2df 100644
--- a/core/benches/crds_gossip_pull.rs
+++ b/core/benches/crds_gossip_pull.rs
@@ -8,7 +8,6 @@ use solana_core::cluster_info::MAX_BLOOM_SIZE;
 use solana_core::crds::Crds;
 use solana_core::crds_gossip_pull::{CrdsFilter, CrdsGossipPull};
 use solana_core::crds_value::CrdsValue;
-use solana_sdk::hash::Hash;
 use test::Bencher;
 
 #[bench]
diff --git a/core/benches/crds_shards.rs b/core/benches/crds_shards.rs
index ba3fb5b3d4..1f3f4c46f2 100644
--- a/core/benches/crds_shards.rs
+++ b/core/benches/crds_shards.rs
@@ -7,7 +7,6 @@ use solana_core::contact_info::ContactInfo;
 use solana_core::crds::VersionedCrdsValue;
 use solana_core::crds_shards::CrdsShards;
 use solana_core::crds_value::{CrdsData, CrdsValue};
-use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::timestamp;
 use test::Bencher;
 
diff --git a/core/benches/retransmit_stage.rs b/core/benches/retransmit_stage.rs
index dff0915196..4633dc6164 100644
--- a/core/benches/retransmit_stage.rs
+++ b/core/benches/retransmit_stage.rs
@@ -14,7 +14,6 @@ use solana_perf::packet::to_packets_chunked;
 use solana_perf::test_tx::test_tx;
 use solana_runtime::bank::Bank;
 use solana_runtime::bank_forks::BankForks;
-use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::timestamp;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/core/src/broadcast_stage/broadcast_fake_shreds_run.rs b/core/src/broadcast_stage/broadcast_fake_shreds_run.rs
index 664975ed57..ce512c6a04 100644
--- a/core/src/broadcast_stage/broadcast_fake_shreds_run.rs
+++ b/core/src/broadcast_stage/broadcast_fake_shreds_run.rs
@@ -140,7 +140,6 @@ impl BroadcastRun for BroadcastFakeShredsRun {
 mod tests {
     use super::*;
     use crate::contact_info::ContactInfo;
-    use solana_sdk::pubkey::Pubkey;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
     #[test]
diff --git a/core/src/crds_shards.rs b/core/src/crds_shards.rs
index 412a7aed31..9ff54628a0 100644
--- a/core/src/crds_shards.rs
+++ b/core/src/crds_shards.rs
@@ -135,7 +135,6 @@ mod test {
     use crate::contact_info::ContactInfo;
     use crate::crds_value::{CrdsData, CrdsValue};
     use rand::{thread_rng, Rng};
-    use solana_sdk::pubkey::Pubkey;
     use solana_sdk::timing::timestamp;
     use std::collections::HashSet;
     use std::ops::Index;
diff --git a/core/src/retransmit_stage.rs b/core/src/retransmit_stage.rs
index c151163050..e32a752707 100644
--- a/core/src/retransmit_stage.rs
+++ b/core/src/retransmit_stage.rs
@@ -504,7 +504,6 @@ mod tests {
     use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_net_utils::find_available_port_in_range;
     use solana_perf::packet::{Meta, Packet, Packets};
-    use solana_sdk::pubkey::Pubkey;
     use std::net::{IpAddr, Ipv4Addr};
 
     #[test]
diff --git a/core/src/verified_vote_packets.rs b/core/src/verified_vote_packets.rs
index b6fc262d87..280ddcaa8a 100644
--- a/core/src/verified_vote_packets.rs
+++ b/core/src/verified_vote_packets.rs
@@ -59,7 +59,6 @@ mod tests {
     use crate::result::Error;
     use crossbeam_channel::{unbounded, RecvTimeoutError};
     use solana_perf::packet::{Meta, Packet};
-    use solana_sdk::pubkey::Pubkey;
 
     #[test]
     fn test_get_latest_votes() {
diff --git a/core/tests/client.rs b/core/tests/client.rs
index 48aa8d73d0..2fa2a05c7b 100644
--- a/core/tests/client.rs
+++ b/core/tests/client.rs
@@ -12,8 +12,7 @@ use solana_runtime::{
     genesis_utils::{create_genesis_config, GenesisConfigInfo},
 };
 use solana_sdk::{
-    commitment_config::CommitmentConfig, pubkey::Pubkey, rpc_port, signature::Signer,
-    system_transaction,
+    commitment_config::CommitmentConfig, rpc_port, signature::Signer, system_transaction,
 };
 use std::{
     fs::remove_dir_all,
diff --git a/core/tests/rpc.rs b/core/tests/rpc.rs
index 31391c55cf..505b5c0e73 100644
--- a/core/tests/rpc.rs
+++ b/core/tests/rpc.rs
@@ -15,8 +15,8 @@ use solana_client::{
 use solana_core::contact_info::ContactInfo;
 use solana_core::{rpc_pubsub::gen_client::Client as PubsubClient, test_validator::TestValidator};
 use solana_sdk::{
-    commitment_config::CommitmentConfig, hash::Hash, pubkey::Pubkey, signature::Signer,
-    system_transaction, transaction::Transaction,
+    commitment_config::CommitmentConfig, hash::Hash, signature::Signer, system_transaction,
+    transaction::Transaction,
 };
 use std::{
     collections::HashSet,
diff --git a/dos/src/main.rs b/dos/src/main.rs
index a20b82d933..be07a693a5 100644
--- a/dos/src/main.rs
+++ b/dos/src/main.rs
@@ -4,7 +4,6 @@ use rand::{thread_rng, Rng};
 use solana_core::{
     contact_info::ContactInfo, gossip_service::discover, serve_repair::RepairProtocol,
 };
-use solana_sdk::pubkey::Pubkey;
 use std::net::{SocketAddr, UdpSocket};
 use std::process::exit;
 use std::time::Instant;
diff --git a/faucet/tests/local-faucet.rs b/faucet/tests/local-faucet.rs
index 399a0a645e..28ec2f02fb 100644
--- a/faucet/tests/local-faucet.rs
+++ b/faucet/tests/local-faucet.rs
@@ -2,7 +2,6 @@ use solana_faucet::faucet::{request_airdrop_transaction, run_local_faucet};
 use solana_sdk::{
     hash::Hash,
     message::Message,
-    pubkey::Pubkey,
     signature::{Keypair, Signer},
     system_instruction,
     transaction::Transaction,
diff --git a/genesis/src/main.rs b/genesis/src/main.rs
index b13e188d9a..b1cc646ec9 100644
--- a/genesis/src/main.rs
+++ b/genesis/src/main.rs
@@ -615,7 +615,6 @@ fn main() -> Result<(), Box<dyn error::Error>> {
 mod tests {
     use super::*;
     use solana_sdk::genesis_config::GenesisConfig;
-    use solana_sdk::pubkey::Pubkey;
     use std::collections::HashMap;
     use std::fs::remove_file;
     use std::io::Write;
diff --git a/ledger/src/genesis_utils.rs b/ledger/src/genesis_utils.rs
index 65ca0a9182..6d1e124097 100644
--- a/ledger/src/genesis_utils.rs
+++ b/ledger/src/genesis_utils.rs
@@ -2,7 +2,6 @@ pub use solana_runtime::genesis_utils::{
     create_genesis_config_with_leader, create_genesis_config_with_leader_ex, GenesisConfigInfo,
     BOOTSTRAP_VALIDATOR_LAMPORTS,
 };
-use solana_sdk::pubkey::Pubkey;
 
 // same as genesis_config::create_genesis_config, but with bootstrap_validator staking logic
 //  for the core crate tests
diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
index 055b0b68f1..f63b0f880b 100644
--- a/local-cluster/tests/local_cluster.rs
+++ b/local-cluster/tests/local_cluster.rs
@@ -35,7 +35,6 @@ use solana_sdk::{
     genesis_config::ClusterType,
     hash::Hash,
     poh_config::PohConfig,
-    pubkey::Pubkey,
     signature::{Keypair, Signer},
     system_transaction,
 };
diff --git a/programs/failure/tests/failure.rs b/programs/failure/tests/failure.rs
index 9bbc716a66..8194e66e7f 100644
--- a/programs/failure/tests/failure.rs
+++ b/programs/failure/tests/failure.rs
@@ -4,7 +4,6 @@ use solana_runtime::loader_utils::create_invoke_instruction;
 use solana_sdk::client::SyncClient;
 use solana_sdk::genesis_config::create_genesis_config;
 use solana_sdk::instruction::InstructionError;
-use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Signer;
 use solana_sdk::transaction::TransactionError;
 
diff --git a/runtime/benches/accounts_index.rs b/runtime/benches/accounts_index.rs
index 8e78e9cb42..342f3ab49c 100644
--- a/runtime/benches/accounts_index.rs
+++ b/runtime/benches/accounts_index.rs
@@ -4,7 +4,6 @@ extern crate test;
 
 use rand::{thread_rng, Rng};
 use solana_runtime::{accounts_db::AccountInfo, accounts_index::AccountsIndex};
-use solana_sdk::pubkey::Pubkey;
 use test::Bencher;
 
 #[bench]
diff --git a/runtime/benches/message_processor.rs b/runtime/benches/message_processor.rs
index 119a765fc1..9eb5ad087d 100644
--- a/runtime/benches/message_processor.rs
+++ b/runtime/benches/message_processor.rs
@@ -4,7 +4,7 @@ extern crate test;
 
 use log::*;
 use solana_runtime::message_processor::PreAccount;
-use solana_sdk::{account::Account, pubkey::Pubkey, rent::Rent};
+use solana_sdk::{account::Account, rent::Rent};
 use test::Bencher;
 
 #[bench]
diff --git a/runtime/src/transaction_batch.rs b/runtime/src/transaction_batch.rs
index 1fb64ea2e1..5002927ddd 100644
--- a/runtime/src/transaction_batch.rs
+++ b/runtime/src/transaction_batch.rs
@@ -62,7 +62,7 @@ impl<'a, 'b> Drop for TransactionBatch<'a, 'b> {
 mod tests {
     use super::*;
     use crate::genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo};
-    use solana_sdk::{pubkey::Pubkey, signature::Keypair, system_transaction};
+    use solana_sdk::{signature::Keypair, system_transaction};
 
     #[test]
     fn test_transaction_batch() {
diff --git a/runtime/tests/bank.rs b/runtime/tests/bank.rs
index 98aefcff54..5e9e118dec 100644
--- a/runtime/tests/bank.rs
+++ b/runtime/tests/bank.rs
@@ -1,5 +1,5 @@
 use solana_runtime::bank::Bank;
-use solana_sdk::{genesis_config::create_genesis_config, hash::hash, pubkey::Pubkey};
+use solana_sdk::{genesis_config::create_genesis_config, hash::hash};
 use std::{sync::Arc, thread::Builder};
 
 #[test]
diff --git a/runtime/tests/noop.rs b/runtime/tests/noop.rs
index 7a6b1cda0c..f7233830b5 100644
--- a/runtime/tests/noop.rs
+++ b/runtime/tests/noop.rs
@@ -1,9 +1,7 @@
 use solana_runtime::{
     bank::Bank, bank_client::BankClient, loader_utils::create_invoke_instruction,
 };
-use solana_sdk::{
-    client::SyncClient, genesis_config::create_genesis_config, pubkey::Pubkey, signature::Signer,
-};
+use solana_sdk::{client::SyncClient, genesis_config::create_genesis_config, signature::Signer};
 
 #[test]
 fn test_program_native_noop() {
diff --git a/sdk/benches/serialize_instructions.rs b/sdk/benches/serialize_instructions.rs
index 1bb605dbf0..3312841583 100644
--- a/sdk/benches/serialize_instructions.rs
+++ b/sdk/benches/serialize_instructions.rs
@@ -4,7 +4,6 @@ extern crate test;
 use bincode::{deserialize, serialize};
 use solana_sdk::instruction::{AccountMeta, Instruction};
 use solana_sdk::message::Message;
-use solana_sdk::pubkey::Pubkey;
 use solana_sdk::sysvar::instructions;
 use test::Bencher;
 
diff --git a/storage-bigtable/src/bigtable.rs b/storage-bigtable/src/bigtable.rs
index 9b10cf5e62..de54a3eccb 100644
--- a/storage-bigtable/src/bigtable.rs
+++ b/storage-bigtable/src/bigtable.rs
@@ -635,7 +635,7 @@ mod tests {
     use super::*;
     use crate::{convert::generated, StoredConfirmedBlock};
     use prost::Message;
-    use solana_sdk::{hash::Hash, pubkey::Pubkey, signature::Keypair, system_transaction};
+    use solana_sdk::{hash::Hash, signature::Keypair, system_transaction};
     use solana_transaction_status::{
         ConfirmedBlock, TransactionStatusMeta, TransactionWithStatusMeta,
     };
diff --git a/transaction-status/src/parse_accounts.rs b/transaction-status/src/parse_accounts.rs
index ea44347952..d20afd067f 100644
--- a/transaction-status/src/parse_accounts.rs
+++ b/transaction-status/src/parse_accounts.rs
@@ -23,7 +23,7 @@ pub fn parse_accounts(message: &Message) -> Vec<ParsedAccount> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use solana_sdk::{message::MessageHeader, pubkey::Pubkey};
+    use solana_sdk::message::MessageHeader;
 
     #[test]
     fn test_parse_accounts() {
diff --git a/transaction-status/src/parse_bpf_loader.rs b/transaction-status/src/parse_bpf_loader.rs
index 94cbc2cdef..abd94d58e9 100644
--- a/transaction-status/src/parse_bpf_loader.rs
+++ b/transaction-status/src/parse_bpf_loader.rs
@@ -37,7 +37,7 @@ pub fn parse_bpf_loader(
 #[cfg(test)]
 mod test {
     use super::*;
-    use solana_sdk::{message::Message, pubkey::Pubkey};
+    use solana_sdk::message::Message;
 
     #[test]
     fn test_parse_bpf_loader_instructions() {