Cleanup client traits and create super trait (#3728)

programs/bpf/tests/programs.rs

@@ -28,8 +28,8 @@ mod bpf {
     mod bpf_c {
         use super::*;
         use solana_sdk::bpf_loader;
+        use solana_sdk::client::SyncClient;
         use solana_sdk::signature::KeypairUtil;
-        use solana_sdk::sync_client::SyncClient;
         use std::io::Read;
 
         #[test]
@@ -100,8 +100,8 @@ mod bpf {
     #[cfg(feature = "bpf_rust")]
     mod bpf_rust {
         use super::*;
+        use solana_sdk::client::SyncClient;
         use solana_sdk::signature::KeypairUtil;
-        use solana_sdk::sync_client::SyncClient;
         use std::io::Read;
 
         #[test]

programs/budget_api/src/budget_processor.rs

@@ -147,11 +147,11 @@ mod tests {
     use crate::id;
     use solana_runtime::bank::Bank;
     use solana_runtime::bank_client::BankClient;
+    use solana_sdk::client::SyncClient;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::instruction::InstructionError;
     use solana_sdk::message::Message;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::sync_client::SyncClient;
     use solana_sdk::transaction::TransactionError;
 
     fn create_bank(lamports: u64) -> (Bank, Keypair) {

programs/config_api/src/config_processor.rs

@@ -33,10 +33,10 @@ mod tests {
     use serde_derive::{Deserialize, Serialize};
     use solana_runtime::bank::Bank;
     use solana_runtime::bank_client::BankClient;
+    use solana_sdk::client::SyncClient;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::message::Message;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::sync_client::SyncClient;
     use solana_sdk::system_instruction;
 
     #[derive(Serialize, Deserialize, Default, Debug, PartialEq)]

programs/exchange_api/src/exchange_processor.rs

@@ -451,9 +451,9 @@ mod test {
     use crate::exchange_instruction;
     use solana_runtime::bank::Bank;
     use solana_runtime::bank_client::BankClient;
+    use solana_sdk::client::SyncClient;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::sync_client::SyncClient;
     use solana_sdk::system_instruction;
     use std::mem;
 

programs/failure_program/tests/failure.rs

@@ -1,11 +1,11 @@
 use solana_runtime::bank::Bank;
 use solana_runtime::bank_client::BankClient;
 use solana_runtime::loader_utils::{create_invoke_instruction, load_program};
+use solana_sdk::client::SyncClient;
 use solana_sdk::genesis_block::GenesisBlock;
 use solana_sdk::instruction::InstructionError;
 use solana_sdk::native_loader;
 use solana_sdk::signature::KeypairUtil;
-use solana_sdk::sync_client::SyncClient;
 use solana_sdk::transaction::TransactionError;
 
 #[test]

programs/noop_program/tests/noop.rs

@@ -1,10 +1,10 @@
 use solana_runtime::bank::Bank;
 use solana_runtime::bank_client::BankClient;
 use solana_runtime::loader_utils::{create_invoke_instruction, load_program};
+use solana_sdk::client::SyncClient;
 use solana_sdk::genesis_block::GenesisBlock;
 use solana_sdk::native_loader;
 use solana_sdk::signature::KeypairUtil;
-use solana_sdk::sync_client::SyncClient;
 
 #[test]
 fn test_program_native_noop() {

programs/storage_api/src/storage_processor.rs

@@ -90,12 +90,12 @@ mod tests {
     use solana_runtime::bank::Bank;
     use solana_runtime::bank_client::BankClient;
     use solana_sdk::account::{create_keyed_accounts, Account};
+    use solana_sdk::client::SyncClient;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::hash::{hash, Hash};
     use solana_sdk::instruction::Instruction;
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
-    use solana_sdk::sync_client::SyncClient;
     use solana_sdk::system_instruction;
 
     fn test_instruction(

programs/vote_api/src/vote_instruction.rs

@@ -103,12 +103,12 @@ mod tests {
     use crate::vote_state::{Vote, VoteState};
     use solana_runtime::bank::Bank;
     use solana_runtime::bank_client::BankClient;
+    use solana_sdk::client::SyncClient;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::instruction::InstructionError;
     use solana_sdk::message::Message;
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::sync_client::SyncClient;
     use solana_sdk::system_instruction;
     use solana_sdk::transaction::{Result, TransactionError};