Remove signature.rs indirection

benches/bank.rs

@@ -7,9 +7,9 @@ extern crate test;
 
 use solana::bank::*;
 use solana::mint::Mint;
-use solana::signature::{Keypair, KeypairUtil};
 use solana::system_transaction::SystemTransaction;
 use solana_sdk::hash::hash;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use test::Bencher;
 

benches/banking_stage.rs

@@ -13,10 +13,10 @@ use solana::banking_stage::{BankingStage, NUM_THREADS};
 use solana::entry::Entry;
 use solana::mint::Mint;
 use solana::packet::to_packets_chunked;
-use solana::signature::{KeypairUtil, Signature};
 use solana::system_transaction::SystemTransaction;
 use solana_sdk::hash::hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{KeypairUtil, Signature};
 use solana_sdk::transaction::Transaction;
 use std::iter;
 use std::sync::mpsc::{channel, Receiver};

benches/ledger.rs

@@ -5,9 +5,9 @@ extern crate test;
 
 use solana::entry::reconstruct_entries_from_blobs;
 use solana::ledger::{next_entries, Block};
-use solana::signature::{Keypair, KeypairUtil};
 use solana::system_transaction::SystemTransaction;
 use solana_sdk::hash::{hash, Hash};
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use test::Bencher;
 

benches/signature.rs

@@ -1,5 +1,6 @@
 #![feature(test)]
 extern crate solana;
+extern crate solana_sdk;
 extern crate test;
 
 use solana::signature::GenKeys;

src/bank.rs

@@ -23,11 +23,11 @@ use program::ProgramError;
 use rayon::prelude::*;
 use rpc::RpcSignatureStatus;
 use runtime::{self, RuntimeError};
-use signature::Keypair;
-use signature::Signature;
 use solana_sdk::account::Account;
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::Keypair;
+use solana_sdk::signature::Signature;
 use solana_sdk::system_instruction::SystemInstruction;
 use solana_sdk::timing::{duration_as_us, timestamp};
 use solana_sdk::transaction::Transaction;
@@ -1369,9 +1369,10 @@ mod tests {
     use entry::Entry;
     use jsonrpc_macros::pubsub::{Subscriber, SubscriptionId};
     use ledger;
-    use signature::Keypair;
+    use signature::GenKeys;
-    use signature::{GenKeys, KeypairUtil};
     use solana_sdk::hash::hash;
+    use solana_sdk::signature::Keypair;
+    use solana_sdk::signature::KeypairUtil;
     use solana_sdk::transaction::Instruction;
     use std;
     use storage_program;

src/banking_stage.rs

@@ -255,7 +255,7 @@ mod tests {
     use ledger::Block;
     use mint::Mint;
     use packet::to_packets;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::thread::sleep;
     use system_transaction::SystemTransaction;

src/bin/bench-tps.rs

@@ -15,13 +15,14 @@ use solana::cluster_info::{ClusterInfo, NodeInfo};
 use solana::logger;
 use solana::ncp::Ncp;
 use solana::service::Service;
-use solana::signature::{read_keypair, GenKeys, Keypair, KeypairUtil};
+use solana::signature::GenKeys;
 use solana::system_transaction::SystemTransaction;
 use solana::thin_client::{poll_gossip_for_leader, ThinClient};
 use solana::window::default_window;
 use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT};
 use solana_metrics::influxdb;
 use solana_sdk::hash::Hash;
+use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil};
 use solana_sdk::timing::timestamp;
 use solana_sdk::timing::{duration_as_ms, duration_as_s};
 use solana_sdk::transaction::Transaction;

src/bin/fullnode-config.rs

@@ -4,6 +4,7 @@ extern crate dirs;
 extern crate ring;
 extern crate serde_json;
 extern crate solana;
+extern crate solana_sdk;
 
 use clap::{App, Arg};
 use ring::rand::SystemRandom;
@@ -12,7 +13,7 @@ use solana::cluster_info::FULLNODE_PORT_RANGE;
 use solana::fullnode::Config;
 use solana::logger;
 use solana::netutil::{get_ip_addr, get_public_ip_addr, parse_port_or_addr};
-use solana::signature::read_pkcs8;
+use solana_sdk::signature::read_pkcs8;
 use std::io;
 use std::net::SocketAddr;
 

src/bin/fullnode.rs

@@ -7,6 +7,7 @@ extern crate serde_json;
 #[macro_use]
 extern crate solana;
 extern crate solana_metrics;
+extern crate solana_sdk;
 
 use clap::{App, Arg};
 use solana::client::mk_client;
@@ -15,10 +16,10 @@ use solana::fullnode::{Config, Fullnode, FullnodeReturnType};
 use solana::leader_scheduler::LeaderScheduler;
 use solana::logger;
 use solana::netutil::find_available_port_in_range;
-use solana::signature::{Keypair, KeypairUtil};
 use solana::thin_client::poll_gossip_for_leader;
 use solana::vote_program::VoteProgram;
 use solana::vote_transaction::VoteTransaction;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use std::fs::File;
 use std::net::{Ipv4Addr, SocketAddr};
 use std::process::exit;

src/bin/genesis.rs

@@ -5,13 +5,14 @@ extern crate atty;
 extern crate clap;
 extern crate serde_json;
 extern crate solana;
+extern crate solana_sdk;
 extern crate untrusted;
 
 use clap::{App, Arg};
 use solana::fullnode::Config;
 use solana::ledger::LedgerWriter;
 use solana::mint::Mint;
-use solana::signature::KeypairUtil;
+use solana_sdk::signature::KeypairUtil;
 use std::error;
 use std::fs::File;
 use std::path::Path;

src/bin/replicator.rs

@@ -15,9 +15,9 @@ use solana::fullnode::Config;
 use solana::ledger::LEDGER_DATA_FILE;
 use solana::logger;
 use solana::replicator::{sample_file, Replicator};
-use solana::signature::{Keypair, KeypairUtil};
 use solana::storage_transaction::StorageTransaction;
 use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT};
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use std::fs::File;
 use std::net::{Ipv4Addr, SocketAddr};

src/bin/wallet.rs

@@ -3,11 +3,12 @@ extern crate clap;
 extern crate dirs;
 #[macro_use]
 extern crate solana;
+extern crate solana_sdk;
 
 use clap::{App, Arg, ArgMatches, SubCommand};
 use solana::logger;
-use solana::signature::{read_keypair, KeypairUtil};
 use solana::wallet::{gen_keypair_file, parse_command, process_command, WalletConfig, WalletError};
+use solana_sdk::signature::{read_keypair, KeypairUtil};
 use std::error;
 use std::net::SocketAddr;
 

src/budget_expr.rs

@@ -141,7 +141,7 @@ impl BudgetExpr {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
 
     #[test]
     fn test_signature_satisfied() {

src/budget_program.rs

@@ -265,10 +265,11 @@ mod test {
     use bincode::serialize;
     use budget_transaction::BudgetTransaction;
     use chrono::prelude::{DateTime, NaiveDate, Utc};
-    use signature::{GenKeys, Keypair, KeypairUtil};
+    use signature::GenKeys;
     use solana_sdk::account::Account;
     use solana_sdk::hash::Hash;
     use solana_sdk::pubkey::Pubkey;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
 
     fn process_transaction(tx: &Transaction, accounts: &mut [Account]) -> Result<(), BudgetError> {

src/budget_transaction.rs

@@ -6,9 +6,9 @@ use budget_instruction::Instruction;
 use budget_program;
 use chrono::prelude::*;
 use payment_plan::Payment;
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::system_instruction::{SystemInstruction, SYSTEM_PROGRAM_ID};
 use solana_sdk::transaction::{self, Transaction};
 
@@ -227,7 +227,6 @@ impl BudgetTransaction for Transaction {
 mod tests {
     use super::*;
     use bincode::{deserialize, serialize};
-    use signature::KeypairUtil;
 
     #[test]
     fn test_claim() {

src/cluster_info.rs

@@ -28,9 +28,9 @@ use rand::{thread_rng, Rng};
 use rayon::prelude::*;
 use result::Result;
 use rpc::RPC_PORT;
-use signature::{Keypair, KeypairUtil, Signable, Signature};
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil, Signable, Signature};
 use solana_sdk::timing::{duration_as_ms, timestamp};
 use std::collections::HashMap;
 use std::io;
@@ -1120,8 +1120,8 @@ mod tests {
     use logger;
     use packet::SharedBlob;
     use result::Error;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::{hash, Hash};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use std::fs::remove_dir_all;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
     use std::sync::{Arc, RwLock};

src/compute_leader_finality_service.rs

@@ -138,8 +138,8 @@ pub mod tests {
     use compute_leader_finality_service::ComputeLeaderFinalityService;
     use logger;
     use mint::Mint;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::sync::Arc;
     use std::thread::sleep;

src/contact_info.rs

@@ -1,7 +1,7 @@
 use bincode::serialize;
 use rpc::RPC_PORT;
-use signature::{Keypair, KeypairUtil, Signable, Signature};
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil, Signable, Signature};
 use solana_sdk::timing::timestamp;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 

src/crds.rs

@@ -164,7 +164,7 @@ mod test {
     use super::*;
     use contact_info::ContactInfo;
     use crds_value::LeaderId;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
 
     #[test]
     fn test_insert() {

src/crds_gossip.rs

@@ -162,8 +162,8 @@ mod test {
     use crds_gossip_push::CRDS_GOSSIP_PUSH_MSG_TIMEOUT_MS;
     use crds_value::CrdsValueLabel;
     use rayon::prelude::*;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::timing::timestamp;
     use std::collections::HashMap;
     use std::sync::{Arc, Mutex};

src/crds_gossip_pull.rs

@@ -196,7 +196,7 @@ mod test {
     use super::*;
     use contact_info::ContactInfo;
     use crds_value::LeaderId;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
 
     #[test]
     fn test_new_pull_request() {

src/crds_gossip_push.rs

@@ -244,7 +244,7 @@ impl CrdsGossipPush {
 mod test {
     use super::*;
     use contact_info::ContactInfo;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     #[test]
     fn test_process_push() {
         let mut crds = Crds::default();

src/crds_value.rs

@@ -1,7 +1,7 @@
 use bincode::serialize;
 use contact_info::ContactInfo;
-use signature::{Keypair, Signable, Signature};
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, Signable, Signature};
 use solana_sdk::transaction::Transaction;
 use std::fmt;
 

src/db_window.rs

@@ -358,7 +358,7 @@ mod test {
     use ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
     use packet::{Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE};
     use rocksdb::{Options, DB};
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use std::io;
     use std::io::Write;
     use std::net::UdpSocket;

src/entry.rs

@@ -275,8 +275,8 @@ mod tests {
     use budget_transaction::BudgetTransaction;
     use chrono::prelude::*;
     use entry::Entry;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use system_transaction::SystemTransaction;
 

src/erasure.rs

@@ -598,8 +598,8 @@ mod test {
     use logger;
     use packet::{index_blobs, SharedBlob, BLOB_DATA_SIZE, BLOB_HEADER_SIZE, BLOB_SIZE};
     use rand::{thread_rng, Rng};
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::pubkey::Pubkey;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     //    use std::sync::{Arc, RwLock};
     use window::WindowSlot;
 

src/fullnode.rs

@@ -10,8 +10,8 @@ use ncp::Ncp;
 use rpc::JsonRpcService;
 use rpc_pubsub::PubSubService;
 use service::Service;
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::Hash;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::timing::timestamp;
 use std::net::UdpSocket;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
@@ -656,7 +656,7 @@ mod tests {
     use ledger::{create_tmp_genesis, create_tmp_sample_ledger, tmp_copy_ledger, LedgerWriter};
     use packet::make_consecutive_blobs;
     use service::Service;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use std::cmp;
     use std::fs::remove_dir_all;
     use std::net::UdpSocket;

src/leader_scheduler.rs

@@ -7,9 +7,9 @@ use bincode::serialize;
 use byteorder::{LittleEndian, ReadBytesExt};
 use entry::Entry;
 use ledger::create_ticks;
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use std::collections::HashSet;
 use std::io::Cursor;
@@ -511,9 +511,9 @@ mod tests {
         DEFAULT_LEADER_ROTATION_INTERVAL, DEFAULT_SEED_ROTATION_INTERVAL,
     };
     use mint::Mint;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::Hash;
     use solana_sdk::pubkey::Pubkey;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::collections::HashSet;
     use std::hash::Hash as StdHash;

src/ledger.rs

@@ -10,9 +10,9 @@ use log::Level::Trace;
 use mint::Mint;
 use packet::{SharedBlob, BLOB_DATA_SIZE};
 use rayon::prelude::*;
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use std::fs::{copy, create_dir_all, remove_dir_all, File, OpenOptions};
 use std::io::prelude::*;
@@ -704,8 +704,8 @@ mod tests {
     use budget_transaction::BudgetTransaction;
     use entry::{next_entry, reconstruct_entries_from_blobs, Entry};
     use packet::{to_blobs, BLOB_DATA_SIZE, PACKET_DATA_SIZE};
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};

src/loader_transaction.rs

@@ -1,9 +1,9 @@
 //! The `dynamic_transaction` module provides functionality for loading and calling a program
 
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::Hash;
 use solana_sdk::loader_instruction::LoaderInstruction;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 
 pub trait LoaderTransaction {

src/mint.rs

@@ -2,9 +2,9 @@
 
 use entry::Entry;
 use ring::rand::SystemRandom;
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use system_transaction::SystemTransaction;
 use untrusted::Input;

src/packet.rs

@@ -467,8 +467,8 @@ mod tests {
         to_packets, Blob, Meta, Packet, Packets, SharedBlob, SharedPackets, NUM_PACKETS,
         PACKET_DATA_SIZE,
     };
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::io;
     use std::io::Write;

src/replicate_stage.rs

@@ -11,8 +11,8 @@ use log::Level;
 use packet::BlobError;
 use result::{Error, Result};
 use service::Service;
-use signature::{Keypair, KeypairUtil};
 use solana_metrics::{influxdb, submit};
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::timing::duration_as_ms;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
@@ -253,8 +253,8 @@ mod test {
     use replicate_stage::{ReplicateStage, ReplicateStageReturnType};
     use result::Error;
     use service::Service;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use std::fs::remove_dir_all;
     use std::sync::atomic::{AtomicBool, Ordering};
     use std::sync::mpsc::channel;

src/replicator.rs

@@ -177,8 +177,8 @@ impl Replicator {
 mod tests {
     use logger;
     use replicator::sample_file;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use std::fs::File;
     use std::fs::{create_dir_all, remove_file};
     use std::io::Write;

src/rpc.rs

@@ -8,10 +8,10 @@ use jsonrpc_core::*;
 use jsonrpc_http_server::*;
 use packet::PACKET_DATA_SIZE;
 use service::Service;
-use signature::Signature;
 use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT};
 use solana_sdk::account::Account;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::Signature;
 use solana_sdk::transaction::Transaction;
 use std::mem;
 use std::net::{SocketAddr, UdpSocket};
@@ -372,8 +372,8 @@ mod tests {
     use mint::Mint;
     use reqwest;
     use reqwest::header::CONTENT_TYPE;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::{hash, Hash};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::fs::remove_dir_all;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};

src/rpc_pubsub.rs

@@ -9,9 +9,9 @@ use jsonrpc_pubsub::{PubSubHandler, Session, SubscriptionId};
 use jsonrpc_ws_server::{RequestContext, Sender, ServerBuilder};
 use rpc::{JsonRpcRequestProcessor, RpcSignatureStatus};
 use service::Service;
-use signature::{Keypair, KeypairUtil, Signature};
 use solana_sdk::account::Account;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
 use std::collections::HashMap;
 use std::mem;
 use std::net::SocketAddr;
@@ -250,7 +250,7 @@ mod tests {
     use budget_transaction::BudgetTransaction;
     use jsonrpc_core::futures::sync::mpsc;
     use mint::Mint;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::net::{IpAddr, Ipv4Addr};
     use system_transaction::SystemTransaction;

src/signature.rs

@@ -2,10 +2,9 @@
 
 use rand::{ChaChaRng, Rng, SeedableRng};
 use rayon::prelude::*;
+use solana_sdk::signature::Keypair;
 use untrusted::Input;
 
-pub use solana_sdk::signature::*;
-
 pub struct GenKeys {
     generator: ChaChaRng,
 }
@@ -38,6 +37,7 @@ impl GenKeys {
 mod tests {
     use super::*;
     pub use solana_sdk::pubkey::Pubkey;
+    use solana_sdk::signature::KeypairUtil;
     use std::collections::HashSet;
 
     #[test]

src/sigverify.rs

@@ -9,8 +9,8 @@ use counter::Counter;
 use log::Level;
 use packet::{Packet, SharedPackets};
 use result::Result;
-use signature::Signature;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::Signature;
 #[cfg(test)]
 use solana_sdk::transaction::Transaction;
 use std::io;
@@ -70,8 +70,8 @@ pub fn init() {
 
 fn verify_packet(packet: &Packet) -> u8 {
     use ring::signature;
-    use signature::Signature;
     use solana_sdk::pubkey::Pubkey;
+    use solana_sdk::signature::Signature;
     use untrusted;
 
     let (sig_len, sig_start, msg_start, pubkey_start) = get_packet_offsets(packet, 0);
@@ -325,9 +325,9 @@ mod tests {
     use bincode::serialize;
     use budget_program;
     use packet::{Packet, SharedPackets};
-    use signature::{Keypair, KeypairUtil};
     use sigverify;
     use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::system_instruction::SystemInstruction;
     use solana_sdk::transaction::{Instruction, Transaction};
     use system_program;

src/storage_program.rs

@@ -69,8 +69,7 @@ pub fn process(
 #[cfg(test)]
 mod test {
     use super::*;
-    use signature::Keypair;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
-    use signature::KeypairUtil;
 
     #[test]
     fn test_storage_tx() {

src/storage_stage.rs

@@ -8,10 +8,10 @@ use entry::EntryReceiver;
 use rand::{ChaChaRng, Rng, SeedableRng};
 use result::{Error, Result};
 use service::Service;
-use signature::Keypair;
-use signature::Signature;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::Keypair;
+use solana_sdk::signature::Signature;
 use std::mem::size_of;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::RecvTimeoutError;
@@ -265,8 +265,8 @@ mod tests {
     use logger;
     use rayon::prelude::*;
     use service::Service;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::cmp::{max, min};
     use std::fs::remove_dir_all;

src/storage_transaction.rs

@@ -1,5 +1,5 @@
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::Hash;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use storage_program::{self, StorageProgram};
 

src/system_program.rs

@@ -133,10 +133,10 @@ pub fn process(
 #[cfg(test)]
 mod test {
     use super::*;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::account::Account;
     use solana_sdk::hash::Hash;
     use solana_sdk::pubkey::Pubkey;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Instruction;
     use system_transaction::SystemTransaction;
 

src/system_transaction.rs

@@ -1,8 +1,8 @@
 //! The `system_transaction` module provides functionality for creating system transactions.
 
-use signature::{Keypair, KeypairUtil};
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::system_instruction::SystemInstruction;
 use solana_sdk::transaction::{Instruction, Transaction};
 use system_program;

src/thin_client.rs

@@ -14,12 +14,12 @@ use reqwest;
 use result::{Error, Result};
 use rpc_request::{RpcClient, RpcRequest};
 use serde_json;
-use signature::{Keypair, Signature};
 use solana_metrics;
 use solana_metrics::influxdb;
 use solana_sdk::account::Account;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, Signature};
 use solana_sdk::timing;
 use solana_sdk::transaction::Transaction;
 use std;
@@ -464,7 +464,7 @@ mod tests {
     use ledger::create_tmp_ledger_with_mint;
     use logger;
     use mint::Mint;
-    use signature::{Keypair, KeypairUtil};
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::system_instruction::SystemInstruction;
     use std::fs::remove_dir_all;
     use vote_program::VoteProgram;

src/tvu.rs

@@ -18,8 +18,8 @@ use ledger_write_stage::LedgerWriteStage;
 use replicate_stage::{ReplicateStage, ReplicateStageReturnType};
 use retransmit_stage::RetransmitStage;
 use service::Service;
-use signature::Keypair;
 use solana_sdk::hash::Hash;
+use solana_sdk::signature::Keypair;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, RwLock};
@@ -177,8 +177,8 @@ pub mod tests {
     use packet::SharedBlob;
     use rocksdb::{Options, DB};
     use service::Service;
-    use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
     use std::fs::remove_dir_all;
     use std::net::UdpSocket;

src/vote_stage.rs

@@ -7,8 +7,8 @@ use counter::Counter;
 use log::Level;
 use packet::SharedBlob;
 use result::{Error, Result};
-use signature::Keypair;
 use solana_sdk::hash::Hash;
+use solana_sdk::signature::Keypair;
 use solana_sdk::transaction::Transaction;
 use std::net::SocketAddr;
 use std::sync::atomic::AtomicUsize;

src/vote_transaction.rs

@@ -5,11 +5,11 @@ use bank::Bank;
 use bincode::deserialize;
 #[cfg(test)]
 use result::Result;
-use signature::Keypair;
-#[cfg(test)]
-use signature::KeypairUtil;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::Keypair;
+#[cfg(test)]
+use solana_sdk::signature::KeypairUtil;
 use solana_sdk::system_instruction::SystemInstruction;
 use solana_sdk::transaction::{Instruction, Transaction};
 use system_program;

src/wallet.rs

@@ -13,10 +13,10 @@ use ring::signature::Ed25519KeyPair;
 use rpc::RpcSignatureStatus;
 use rpc_request::{RpcClient, RpcRequest};
 use serde_json;
-use signature::{Keypair, KeypairUtil, Signature};
 use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT};
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
 use solana_sdk::transaction::Transaction;
 use std::fs::{self, File};
 use std::io::Write;
@@ -780,8 +780,8 @@ mod tests {
     use leader_scheduler::LeaderScheduler;
     use ledger::create_tmp_genesis;
     use serde_json::Value;
-    use signature::{read_keypair, read_pkcs8, Keypair, KeypairUtil};
     use solana_drone::drone::run_local_drone;
+    use solana_sdk::signature::{read_keypair, read_pkcs8, Keypair, KeypairUtil};
     use std::fs::remove_dir_all;
     use std::sync::mpsc::channel;
     use std::sync::{Arc, RwLock};

tests/data_replicator.rs

@@ -11,7 +11,7 @@ use solana::ncp::Ncp;
 use solana::packet::{Blob, SharedBlob};
 use solana::result;
 use solana::service::Service;
-use solana::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::timing::timestamp;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, Ordering};

tests/multinode.rs

@@ -24,12 +24,12 @@ use solana::packet::SharedBlob;
 use solana::poh_service::NUM_TICKS_PER_SECOND;
 use solana::result;
 use solana::service::Service;
-use solana::signature::{Keypair, KeypairUtil};
 use solana::system_transaction::SystemTransaction;
 use solana::thin_client::{retry_get_balance, ThinClient};
 use solana::window::default_window;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::timing::{duration_as_ms, duration_as_s};
 use solana_sdk::transaction::Transaction;
 use std::collections::{HashSet, VecDeque};

tests/programs.rs

@@ -11,9 +11,9 @@ use solana::loader_transaction::LoaderTransaction;
 use solana::logger;
 use solana::mint::Mint;
 use solana::native_loader;
-use solana::signature::{Keypair, KeypairUtil};
 use solana::system_transaction::SystemTransaction;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 #[cfg(feature = "bpf_c")]
 use std::env;

tests/replicator.rs

@@ -1,6 +1,7 @@
 #[macro_use]
 extern crate log;
 extern crate solana;
+extern crate solana_sdk;
 
 use solana::client::mk_client;
 use solana::cluster_info::Node;
@@ -10,7 +11,7 @@ use solana::leader_scheduler::LeaderScheduler;
 use solana::ledger::{create_tmp_genesis, get_tmp_ledger_path, read_ledger};
 use solana::logger;
 use solana::replicator::Replicator;
-use solana::signature::{Keypair, KeypairUtil};
+use solana_sdk::signature::{Keypair, KeypairUtil};
 use std::fs::remove_dir_all;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;