diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs index a81a2568c2..60ca5005a3 100644 --- a/sdk/src/lib.rs +++ b/sdk/src/lib.rs @@ -6,6 +6,7 @@ pub mod budget_program; pub mod budget_transaction; pub mod hash; pub mod loader_instruction; +pub mod loader_transaction; pub mod native_loader; pub mod native_program; pub mod packet; diff --git a/src/loader_transaction.rs b/sdk/src/loader_transaction.rs similarity index 60% rename from src/loader_transaction.rs rename to sdk/src/loader_transaction.rs index 6065fb5902..cbad3831e4 100644 --- a/src/loader_transaction.rs +++ b/sdk/src/loader_transaction.rs @@ -1,10 +1,10 @@ -//! The `dynamic_transaction` module provides functionality for loading and calling a program +//! The `loader_transaction` module provides functionality for loading and calling a program -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; +use hash::Hash; +use loader_instruction::LoaderInstruction; +use pubkey::Pubkey; +use signature::Keypair; +use transaction::Transaction; pub trait LoaderTransaction { fn loader_write( @@ -28,21 +28,11 @@ impl LoaderTransaction for Transaction { last_id: Hash, fee: u64, ) -> Self { - trace!( - "LoaderTransaction::Write() program {:?} offset {} length {}", - from_keypair.pubkey(), - offset, - bytes.len() - ); let instruction = LoaderInstruction::Write { offset, bytes }; Transaction::new(from_keypair, &[], loader, &instruction, last_id, fee) } fn loader_finalize(from_keypair: &Keypair, loader: Pubkey, last_id: Hash, fee: u64) -> Self { - trace!( - "LoaderTransaction::Finalize() program {:?}", - from_keypair.pubkey(), - ); let instruction = LoaderInstruction::Finalize; Transaction::new(from_keypair, &[], loader, &instruction, last_id, fee) } diff --git a/src/lib.rs b/src/lib.rs index e3cdb0463f..a294bc500c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -41,7 +41,6 @@ pub mod fullnode; pub mod leader_scheduler; pub mod ledger; pub mod ledger_write_stage; -pub mod loader_transaction; pub mod logger; pub mod mint; pub mod native_loader; diff --git a/src/wallet.rs b/src/wallet.rs index 0ad3798847..8b47439ed9 100644 --- a/src/wallet.rs +++ b/src/wallet.rs @@ -4,7 +4,6 @@ use chrono::prelude::*; use clap::ArgMatches; use elf; use fullnode::Config; -use loader_transaction::LoaderTransaction; use ring::rand::SystemRandom; use ring::signature::Ed25519KeyPair; use rpc::RpcSignatureStatus; @@ -15,6 +14,7 @@ use solana_sdk::bpf_loader; use solana_sdk::budget_program; use solana_sdk::budget_transaction::BudgetTransaction; use solana_sdk::hash::Hash; +use solana_sdk::loader_transaction::LoaderTransaction; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{Keypair, KeypairUtil, Signature}; use solana_sdk::transaction::Transaction; diff --git a/tests/programs.rs b/tests/programs.rs index c25413a8c0..8fc12fee9c 100644 --- a/tests/programs.rs +++ b/tests/programs.rs @@ -5,13 +5,13 @@ extern crate solana; extern crate solana_sdk; use solana::bank::Bank; -use solana::loader_transaction::LoaderTransaction; use solana::logger; use solana::mint::Mint; use solana::native_loader; use solana::system_transaction::SystemTransaction; #[cfg(feature = "bpf_c")] use solana_sdk::bpf_loader; +use solana_sdk::loader_transaction::LoaderTransaction; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::transaction::Transaction;