From 0878bd53d90211264cb8493c0ac80d53697b3d78 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 29 Nov 2018 16:18:47 -0800 Subject: [PATCH] Delete stub src/transaction.rs --- benches/bank.rs | 2 +- benches/banking_stage.rs | 2 +- benches/ledger.rs | 2 +- src/bank.rs | 4 ++-- src/banking_stage.rs | 4 ++-- src/bin/bench-tps.rs | 2 +- src/bin/replicator.rs | 3 ++- src/budget_program.rs | 4 ++-- src/budget_transaction.rs | 3 +-- src/compute_leader_finality_service.rs | 2 +- src/crds_value.rs | 2 +- src/entry.rs | 4 ++-- src/leader_scheduler.rs | 4 ++-- src/ledger.rs | 4 ++-- src/lib.rs | 1 - src/loader_transaction.rs | 2 +- src/mint.rs | 2 +- src/packet.rs | 2 +- src/poh_recorder.rs | 2 +- src/rpc.rs | 4 ++-- src/rpc_pubsub.rs | 2 +- src/runtime.rs | 2 +- src/sigverify.rs | 13 ++++--------- src/storage_program.rs | 2 +- src/storage_stage.rs | 2 +- src/storage_transaction.rs | 2 +- src/system_program.rs | 4 ++-- src/system_transaction.rs | 5 ++--- src/thin_client.rs | 2 +- src/transaction.rs | 1 - src/tvu.rs | 2 +- src/vote_program.rs | 2 +- src/vote_stage.rs | 2 +- src/vote_transaction.rs | 2 +- src/wallet.rs | 2 +- tests/multinode.rs | 2 +- tests/programs.rs | 2 +- 37 files changed, 48 insertions(+), 56 deletions(-) delete mode 100644 src/transaction.rs diff --git a/benches/bank.rs b/benches/bank.rs index 28ee689dbe..85d3cebaa9 100644 --- a/benches/bank.rs +++ b/benches/bank.rs @@ -9,8 +9,8 @@ use solana::bank::*; use solana::mint::Mint; use solana::signature::{Keypair, KeypairUtil}; use solana::system_transaction::SystemTransaction; -use solana::transaction::Transaction; use solana_sdk::hash::hash; +use solana_sdk::transaction::Transaction; use test::Bencher; #[bench] diff --git a/benches/banking_stage.rs b/benches/banking_stage.rs index d37c84ea98..231c37ae15 100644 --- a/benches/banking_stage.rs +++ b/benches/banking_stage.rs @@ -15,9 +15,9 @@ use solana::mint::Mint; use solana::packet::to_packets_chunked; use solana::signature::{KeypairUtil, Signature}; use solana::system_transaction::SystemTransaction; -use solana::transaction::Transaction; use solana_sdk::hash::hash; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use std::iter; use std::sync::mpsc::{channel, Receiver}; use std::sync::Arc; diff --git a/benches/ledger.rs b/benches/ledger.rs index 8b3849843c..a01db80892 100644 --- a/benches/ledger.rs +++ b/benches/ledger.rs @@ -7,8 +7,8 @@ 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::transaction::Transaction; use solana_sdk::hash::{hash, Hash}; +use solana_sdk::transaction::Transaction; use test::Bencher; #[bench] diff --git a/src/bank.rs b/src/bank.rs index 90b9f4f2fb..f043e91eea 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -30,6 +30,7 @@ use solana_sdk::hash::{hash, Hash}; use solana_sdk::pubkey::Pubkey; use solana_sdk::system_instruction::SystemInstruction; use solana_sdk::timing::{duration_as_us, timestamp}; +use solana_sdk::transaction::Transaction; use std; use std::collections::{BTreeMap, HashMap, HashSet, VecDeque}; use std::result; @@ -40,7 +41,6 @@ use system_program; use system_transaction::SystemTransaction; use token_program; use tokio::prelude::Future; -use transaction::Transaction; /// The number of most recent `last_id` values that the bank will track the signatures /// of. Once the bank discards a `last_id`, it will reject any transactions that use @@ -1372,11 +1372,11 @@ mod tests { use signature::Keypair; use signature::{GenKeys, KeypairUtil}; use solana_sdk::hash::hash; + use solana_sdk::transaction::Instruction; use std; use storage_program; use system_transaction::SystemTransaction; use tokio::prelude::{Async, Stream}; - use transaction::Instruction; use vote_program; #[test] diff --git a/src/banking_stage.rs b/src/banking_stage.rs index b96b38c629..84c0169c38 100644 --- a/src/banking_stage.rs +++ b/src/banking_stage.rs @@ -16,6 +16,7 @@ use service::Service; use sigverify_stage::VerifiedPackets; use solana_sdk::hash::Hash; use solana_sdk::timing; +use solana_sdk::transaction::Transaction; use std::net::SocketAddr; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::mpsc::{channel, Receiver, RecvTimeoutError}; @@ -23,7 +24,6 @@ use std::sync::{Arc, Mutex}; use std::thread::{self, Builder, JoinHandle}; use std::time::Duration; use std::time::Instant; -use transaction::Transaction; #[derive(Debug, PartialEq, Eq, Clone)] pub enum BankingStageReturnType { @@ -256,9 +256,9 @@ mod tests { use mint::Mint; use packet::to_packets; use signature::{Keypair, KeypairUtil}; + use solana_sdk::transaction::Transaction; use std::thread::sleep; use system_transaction::SystemTransaction; - use transaction::Transaction; #[test] fn test_banking_stage_shutdown1() { diff --git a/src/bin/bench-tps.rs b/src/bin/bench-tps.rs index 8b8f4f7d72..0d5769a844 100644 --- a/src/bin/bench-tps.rs +++ b/src/bin/bench-tps.rs @@ -18,13 +18,13 @@ use solana::service::Service; use solana::signature::{read_keypair, GenKeys, Keypair, KeypairUtil}; use solana::system_transaction::SystemTransaction; use solana::thin_client::{poll_gossip_for_leader, ThinClient}; -use solana::transaction::Transaction; 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::timing::timestamp; use solana_sdk::timing::{duration_as_ms, duration_as_s}; +use solana_sdk::transaction::Transaction; use std::cmp; use std::collections::VecDeque; use std::net::SocketAddr; diff --git a/src/bin/replicator.rs b/src/bin/replicator.rs index 165fa1c89b..f3b20f0058 100644 --- a/src/bin/replicator.rs +++ b/src/bin/replicator.rs @@ -5,6 +5,7 @@ extern crate serde_json; #[macro_use] extern crate solana; extern crate solana_drone; +extern crate solana_sdk; use clap::{App, Arg}; use solana::chacha::{chacha_cbc_encrypt_file, CHACHA_BLOCK_SIZE}; @@ -16,8 +17,8 @@ use solana::logger; use solana::replicator::{sample_file, Replicator}; use solana::signature::{Keypair, KeypairUtil}; use solana::storage_transaction::StorageTransaction; -use solana::transaction::Transaction; use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT}; +use solana_sdk::transaction::Transaction; use std::fs::File; use std::net::{Ipv4Addr, SocketAddr}; use std::path::Path; diff --git a/src/budget_program.rs b/src/budget_program.rs index 8a14f24426..975c84bbd8 100644 --- a/src/budget_program.rs +++ b/src/budget_program.rs @@ -7,8 +7,8 @@ use payment_plan::Witness; use program::ProgramError; use solana_sdk::account::Account; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use std::io; -use transaction::Transaction; #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] pub enum BudgetError { @@ -269,7 +269,7 @@ mod test { use solana_sdk::account::Account; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; - use transaction::Transaction; + use solana_sdk::transaction::Transaction; fn process_transaction(tx: &Transaction, accounts: &mut [Account]) -> Result<(), BudgetError> { let mut refs: Vec<&mut Account> = accounts.iter_mut().collect(); diff --git a/src/budget_transaction.rs b/src/budget_transaction.rs index 4d3f4805fa..05be24fdf9 100644 --- a/src/budget_transaction.rs +++ b/src/budget_transaction.rs @@ -10,7 +10,7 @@ use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::system_instruction::{SystemInstruction, SYSTEM_PROGRAM_ID}; -use transaction::{self, Transaction}; +use solana_sdk::transaction::{self, Transaction}; pub trait BudgetTransaction { fn budget_new_taxed( @@ -228,7 +228,6 @@ mod tests { use super::*; use bincode::{deserialize, serialize}; use signature::KeypairUtil; - use transaction; #[test] fn test_claim() { diff --git a/src/compute_leader_finality_service.rs b/src/compute_leader_finality_service.rs index ea86ebdaeb..e378484b4e 100644 --- a/src/compute_leader_finality_service.rs +++ b/src/compute_leader_finality_service.rs @@ -140,10 +140,10 @@ pub mod tests { use mint::Mint; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::hash; + use solana_sdk::transaction::Transaction; use std::sync::Arc; use std::thread::sleep; use std::time::Duration; - use transaction::Transaction; use vote_program::Vote; use vote_transaction::{create_vote_account, VoteTransaction}; diff --git a/src/crds_value.rs b/src/crds_value.rs index 512d490a41..9ad502cb0e 100644 --- a/src/crds_value.rs +++ b/src/crds_value.rs @@ -1,7 +1,7 @@ use contact_info::ContactInfo; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use std::fmt; -use transaction::Transaction; /// CrdsValue that is replicated across the cluster #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] diff --git a/src/entry.rs b/src/entry.rs index 503c4922c2..b185c0474c 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -8,11 +8,11 @@ use poh::Poh; use result::Result; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use std::io::Cursor; use std::mem::size_of; use std::net::SocketAddr; use std::sync::mpsc::{Receiver, Sender}; -use transaction::Transaction; pub type EntrySender = Sender>; pub type EntryReceiver = Receiver>; @@ -277,8 +277,8 @@ mod tests { use entry::Entry; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::hash; + use solana_sdk::transaction::Transaction; use system_transaction::SystemTransaction; - use transaction::Transaction; #[test] fn test_entry_verify() { diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs index 778f727ab9..8634053090 100644 --- a/src/leader_scheduler.rs +++ b/src/leader_scheduler.rs @@ -10,10 +10,10 @@ use ledger::create_ticks; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::{hash, Hash}; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use std::collections::HashSet; use std::io::Cursor; use system_transaction::SystemTransaction; -use transaction::Transaction; use vote_program::{self, Vote, VoteProgram}; use vote_transaction::VoteTransaction; @@ -503,10 +503,10 @@ mod tests { use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; + use solana_sdk::transaction::Transaction; use std::collections::HashSet; use std::hash::Hash as StdHash; use std::iter::FromIterator; - use transaction::Transaction; use vote_program::Vote; use vote_transaction::{create_vote_account, VoteTransaction}; diff --git a/src/ledger.rs b/src/ledger.rs index 578fb62970..db74eca840 100644 --- a/src/ledger.rs +++ b/src/ledger.rs @@ -13,13 +13,13 @@ use rayon::prelude::*; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::{hash, Hash}; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use std::fs::{copy, create_dir_all, remove_dir_all, File, OpenOptions}; use std::io::prelude::*; use std::io::{self, BufReader, BufWriter, Seek, SeekFrom}; use std::mem::size_of; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::path::Path; -use transaction::Transaction; use vote_program::Vote; use vote_transaction::VoteTransaction; @@ -706,9 +706,9 @@ mod tests { use packet::{to_blobs, BLOB_DATA_SIZE, PACKET_DATA_SIZE}; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::hash; + use solana_sdk::transaction::Transaction; use std; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; - use transaction::Transaction; use vote_program::Vote; #[test] diff --git a/src/lib.rs b/src/lib.rs index 2ed8ce860d..b07bb1a83f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -81,7 +81,6 @@ pub mod thin_client; pub mod token_program; pub mod tpu; pub mod tpu_forwarder; -pub mod transaction; pub mod tvu; pub mod vote_program; pub mod vote_stage; diff --git a/src/loader_transaction.rs b/src/loader_transaction.rs index 10bc3eecb9..03977e53be 100644 --- a/src/loader_transaction.rs +++ b/src/loader_transaction.rs @@ -4,7 +4,7 @@ use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; use solana_sdk::loader_instruction::LoaderInstruction; use solana_sdk::pubkey::Pubkey; -use transaction::Transaction; +use solana_sdk::transaction::Transaction; pub trait LoaderTransaction { fn loader_write( diff --git a/src/mint.rs b/src/mint.rs index 346f0ff3ff..0b46109543 100644 --- a/src/mint.rs +++ b/src/mint.rs @@ -5,8 +5,8 @@ use ring::rand::SystemRandom; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::{hash, Hash}; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use system_transaction::SystemTransaction; -use transaction::Transaction; use untrusted::Input; #[derive(Serialize, Deserialize, Debug)] diff --git a/src/packet.rs b/src/packet.rs index e134308698..ab56e184dc 100644 --- a/src/packet.rs +++ b/src/packet.rs @@ -469,11 +469,11 @@ mod tests { }; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; + use solana_sdk::transaction::Transaction; use std::io; use std::io::Write; use std::net::UdpSocket; use system_transaction::SystemTransaction; - use transaction::Transaction; #[test] pub fn packet_send_recv() { diff --git a/src/poh_recorder.rs b/src/poh_recorder.rs index 0ac484c8c0..31c5296904 100644 --- a/src/poh_recorder.rs +++ b/src/poh_recorder.rs @@ -6,9 +6,9 @@ use entry::Entry; use poh::Poh; use result::{Error, Result}; use solana_sdk::hash::Hash; +use solana_sdk::transaction::Transaction; use std::sync::mpsc::Sender; use std::sync::{Arc, Mutex}; -use transaction::Transaction; #[derive(Debug, PartialEq, Eq, Clone)] pub enum PohRecorderError { diff --git a/src/rpc.rs b/src/rpc.rs index d9557d2a21..672bca195d 100644 --- a/src/rpc.rs +++ b/src/rpc.rs @@ -12,6 +12,7 @@ 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::transaction::Transaction; use std::mem; use std::net::{SocketAddr, UdpSocket}; use std::result; @@ -21,7 +22,6 @@ use std::sync::{Arc, RwLock}; use std::thread::{self, sleep, Builder, JoinHandle}; use std::time::Duration; use std::time::Instant; -use transaction::Transaction; pub const RPC_PORT: u16 = 8899; @@ -374,10 +374,10 @@ mod tests { use reqwest::header::CONTENT_TYPE; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::{hash, Hash}; + use solana_sdk::transaction::Transaction; use std::fs::remove_dir_all; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use system_transaction::SystemTransaction; - use transaction::Transaction; fn start_rpc_handler_with_tx(pubkey: Pubkey) -> (MetaIoHandler, Meta, Hash, Keypair) { let alice = Mint::new(10_000); diff --git a/src/rpc_pubsub.rs b/src/rpc_pubsub.rs index 1f531c2b23..11d9eec236 100644 --- a/src/rpc_pubsub.rs +++ b/src/rpc_pubsub.rs @@ -251,10 +251,10 @@ mod tests { use jsonrpc_core::futures::sync::mpsc; use mint::Mint; use signature::{Keypair, KeypairUtil}; + use solana_sdk::transaction::Transaction; use std::net::{IpAddr, Ipv4Addr}; use system_transaction::SystemTransaction; use tokio::prelude::{Async, Stream}; - use transaction::Transaction; #[test] fn test_pubsub_new() { diff --git a/src/runtime.rs b/src/runtime.rs index e8234aa073..766a395b12 100644 --- a/src/runtime.rs +++ b/src/runtime.rs @@ -3,9 +3,9 @@ use native_loader; use program::ProgramError; use solana_sdk::account::{create_keyed_accounts, Account, KeyedAccount}; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use storage_program; use system_program; -use transaction::Transaction; use vote_program; /// Reasons the runtime might have rejected a transaction. diff --git a/src/sigverify.rs b/src/sigverify.rs index 1576273100..213a6bb78b 100644 --- a/src/sigverify.rs +++ b/src/sigverify.rs @@ -11,11 +11,11 @@ use packet::{Packet, SharedPackets}; use result::Result; use signature::Signature; use solana_sdk::pubkey::Pubkey; +#[cfg(test)] +use solana_sdk::transaction::Transaction; use std::io; use std::mem::size_of; use std::sync::atomic::AtomicUsize; -#[cfg(test)] -use transaction::Transaction; pub const TX_OFFSET: usize = 0; @@ -329,10 +329,9 @@ mod tests { use sigverify; use solana_sdk::hash::Hash; use solana_sdk::system_instruction::SystemInstruction; + use solana_sdk::transaction::{Instruction, Transaction}; use system_program; use system_transaction::{memfind, test_tx}; - use transaction; - use transaction::Transaction; #[test] fn test_layout() { @@ -431,11 +430,7 @@ mod tests { let program_ids = vec![system_program::id(), budget_program::id()]; - let instructions = vec![transaction::Instruction::new( - 0, - &system_instruction, - vec![0, 1], - )]; + let instructions = vec![Instruction::new(0, &system_instruction, vec![0, 1])]; let tx = Transaction::new_with_instructions( &keypairs, diff --git a/src/storage_program.rs b/src/storage_program.rs index 8cfef37bf0..7aa04d0577 100644 --- a/src/storage_program.rs +++ b/src/storage_program.rs @@ -7,7 +7,7 @@ use program::ProgramError; use solana_sdk::account::Account; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; -use transaction::Transaction; +use solana_sdk::transaction::Transaction; #[derive(Serialize, Deserialize, Debug, Clone)] pub enum StorageProgram { diff --git a/src/storage_stage.rs b/src/storage_stage.rs index 924ef3980b..03efe1abd3 100644 --- a/src/storage_stage.rs +++ b/src/storage_stage.rs @@ -267,6 +267,7 @@ mod tests { use service::Service; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; + use solana_sdk::transaction::Transaction; use std::cmp::{max, min}; use std::fs::remove_dir_all; use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; @@ -277,7 +278,6 @@ mod tests { use storage_stage::StorageState; use storage_stage::NUM_IDENTITIES; use storage_stage::{get_identity_index_from_pubkey, StorageStage}; - use transaction::Transaction; use vote_program::Vote; use vote_transaction::VoteTransaction; diff --git a/src/storage_transaction.rs b/src/storage_transaction.rs index ccc1a450b2..33f4358aa1 100644 --- a/src/storage_transaction.rs +++ b/src/storage_transaction.rs @@ -1,7 +1,7 @@ use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; +use solana_sdk::transaction::Transaction; use storage_program::{self, StorageProgram}; -use transaction::Transaction; pub trait StorageTransaction { fn storage_new_mining_proof(from_keypair: &Keypair, sha_state: Hash, last_id: Hash) -> Self; diff --git a/src/system_program.rs b/src/system_program.rs index 79004bca55..2691864bde 100644 --- a/src/system_program.rs +++ b/src/system_program.rs @@ -5,8 +5,8 @@ use program::ProgramError; use solana_sdk::account::Account; use solana_sdk::pubkey::Pubkey; use solana_sdk::system_instruction::SystemInstruction; +use solana_sdk::transaction::Transaction; use std; -use transaction::Transaction; #[derive(Debug)] pub enum Error { @@ -137,8 +137,8 @@ mod test { use solana_sdk::account::Account; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; + use solana_sdk::transaction::Instruction; use system_transaction::SystemTransaction; - use transaction::{Instruction, Transaction}; /// Execute a function with a subset of accounts as writable references. /// Since the subset can point to the same references, in any order there is no way diff --git a/src/system_transaction.rs b/src/system_transaction.rs index d614596491..6e52dde871 100644 --- a/src/system_transaction.rs +++ b/src/system_transaction.rs @@ -4,10 +4,9 @@ use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::system_instruction::SystemInstruction; +use solana_sdk::transaction::{Instruction, Transaction}; use system_program; -use transaction::{Instruction, Transaction}; - pub trait SystemTransaction { fn system_create( from_keypair: &Keypair, @@ -159,7 +158,7 @@ mod tests { use bincode::{deserialize, serialize}; use packet::PACKET_DATA_SIZE; use sigverify; - use transaction::SIG_OFFSET; + use solana_sdk::transaction::SIG_OFFSET; #[test] fn test_layout() { diff --git a/src/thin_client.rs b/src/thin_client.rs index d28bc3e6dd..bc8039f1cc 100644 --- a/src/thin_client.rs +++ b/src/thin_client.rs @@ -21,6 +21,7 @@ use solana_sdk::account::Account; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::timing; +use solana_sdk::transaction::Transaction; use std; use std::collections::HashMap; use std::io; @@ -31,7 +32,6 @@ use std::thread::sleep; use std::time::Duration; use std::time::Instant; use system_transaction::SystemTransaction; -use transaction::Transaction; /// An object for querying and sending transactions to the network. pub struct ThinClient { diff --git a/src/transaction.rs b/src/transaction.rs deleted file mode 100644 index e70dc793af..0000000000 --- a/src/transaction.rs +++ /dev/null @@ -1 +0,0 @@ -pub use solana_sdk::transaction::*; diff --git a/src/tvu.rs b/src/tvu.rs index e5e69c37a0..11d3006e0e 100644 --- a/src/tvu.rs +++ b/src/tvu.rs @@ -179,6 +179,7 @@ pub mod tests { use service::Service; use signature::{Keypair, KeypairUtil}; use solana_sdk::hash::Hash; + use solana_sdk::transaction::Transaction; use std::fs::remove_dir_all; use std::net::UdpSocket; use std::sync::atomic::{AtomicBool, Ordering}; @@ -187,7 +188,6 @@ pub mod tests { use std::time::Duration; use streamer; use system_transaction::SystemTransaction; - use transaction::Transaction; use tvu::Tvu; use window::{self, SharedWindow}; diff --git a/src/vote_program.rs b/src/vote_program.rs index 056896535c..3e19d05b8e 100644 --- a/src/vote_program.rs +++ b/src/vote_program.rs @@ -6,10 +6,10 @@ use byteorder::{ByteOrder, LittleEndian}; use program::ProgramError; use solana_sdk::account::Account; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; use std; use std::collections::VecDeque; use std::mem; -use transaction::Transaction; // Maximum number of votes to keep around const MAX_VOTE_HISTORY: usize = 32; diff --git a/src/vote_stage.rs b/src/vote_stage.rs index 430ed2f04a..c7f8ad5266 100644 --- a/src/vote_stage.rs +++ b/src/vote_stage.rs @@ -9,11 +9,11 @@ use packet::SharedBlob; use result::{Error, Result}; use signature::Keypair; use solana_sdk::hash::Hash; +use solana_sdk::transaction::Transaction; use std::net::SocketAddr; use std::sync::atomic::AtomicUsize; use std::sync::{Arc, RwLock}; use streamer::BlobSender; -use transaction::Transaction; use vote_program::Vote; use vote_transaction::VoteTransaction; diff --git a/src/vote_transaction.rs b/src/vote_transaction.rs index c3b180fe4c..01bcb2ab79 100644 --- a/src/vote_transaction.rs +++ b/src/vote_transaction.rs @@ -11,8 +11,8 @@ use signature::KeypairUtil; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::system_instruction::SystemInstruction; +use solana_sdk::transaction::{Instruction, Transaction}; use system_program; -use transaction::{Instruction, Transaction}; use vote_program::{self, Vote, VoteInstruction}; pub trait VoteTransaction { diff --git a/src/wallet.rs b/src/wallet.rs index 261d3ce985..6413fdd3e5 100644 --- a/src/wallet.rs +++ b/src/wallet.rs @@ -17,6 +17,7 @@ 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::transaction::Transaction; use std::fs::{self, File}; use std::io::Write; use std::net::{Ipv4Addr, SocketAddr}; @@ -27,7 +28,6 @@ use std::time::Duration; use std::{error, fmt, mem}; use system_transaction::SystemTransaction; use thin_client::poll_gossip_for_leader; -use transaction::Transaction; const PLATFORM_SECTION_C: &str = ".text.entrypoint"; const USERDATA_CHUNK_SIZE: usize = 256; diff --git a/tests/multinode.rs b/tests/multinode.rs index 9caf30e546..0b3a51e2dd 100644 --- a/tests/multinode.rs +++ b/tests/multinode.rs @@ -27,11 +27,11 @@ use solana::service::Service; use solana::signature::{Keypair, KeypairUtil}; use solana::system_transaction::SystemTransaction; use solana::thin_client::{retry_get_balance, ThinClient}; -use solana::transaction::Transaction; use solana::window::default_window; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::timing::{duration_as_ms, duration_as_s}; +use solana_sdk::transaction::Transaction; use std::collections::{HashSet, VecDeque}; use std::env; use std::fs::remove_dir_all; diff --git a/tests/programs.rs b/tests/programs.rs index 3172780688..f18701742a 100644 --- a/tests/programs.rs +++ b/tests/programs.rs @@ -13,8 +13,8 @@ use solana::mint::Mint; use solana::native_loader; use solana::signature::{Keypair, KeypairUtil}; use solana::system_transaction::SystemTransaction; -use solana::transaction::Transaction; use solana_sdk::pubkey::Pubkey; +use solana_sdk::transaction::Transaction; #[cfg(feature = "bpf_c")] use std::env; #[cfg(feature = "bpf_c")]