Move loader_transaction out of src/
This commit is contained in:
parent
7af95eadcc
commit
122627dda2
|
@ -6,6 +6,7 @@ pub mod budget_program;
|
||||||
pub mod budget_transaction;
|
pub mod budget_transaction;
|
||||||
pub mod hash;
|
pub mod hash;
|
||||||
pub mod loader_instruction;
|
pub mod loader_instruction;
|
||||||
|
pub mod loader_transaction;
|
||||||
pub mod native_loader;
|
pub mod native_loader;
|
||||||
pub mod native_program;
|
pub mod native_program;
|
||||||
pub mod packet;
|
pub mod packet;
|
||||||
|
|
|
@ -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 hash::Hash;
|
||||||
use solana_sdk::loader_instruction::LoaderInstruction;
|
use loader_instruction::LoaderInstruction;
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use pubkey::Pubkey;
|
||||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
use signature::Keypair;
|
||||||
use solana_sdk::transaction::Transaction;
|
use transaction::Transaction;
|
||||||
|
|
||||||
pub trait LoaderTransaction {
|
pub trait LoaderTransaction {
|
||||||
fn loader_write(
|
fn loader_write(
|
||||||
|
@ -28,21 +28,11 @@ impl LoaderTransaction for Transaction {
|
||||||
last_id: Hash,
|
last_id: Hash,
|
||||||
fee: u64,
|
fee: u64,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
trace!(
|
|
||||||
"LoaderTransaction::Write() program {:?} offset {} length {}",
|
|
||||||
from_keypair.pubkey(),
|
|
||||||
offset,
|
|
||||||
bytes.len()
|
|
||||||
);
|
|
||||||
let instruction = LoaderInstruction::Write { offset, bytes };
|
let instruction = LoaderInstruction::Write { offset, bytes };
|
||||||
Transaction::new(from_keypair, &[], loader, &instruction, last_id, fee)
|
Transaction::new(from_keypair, &[], loader, &instruction, last_id, fee)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn loader_finalize(from_keypair: &Keypair, loader: Pubkey, last_id: Hash, fee: u64) -> Self {
|
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;
|
let instruction = LoaderInstruction::Finalize;
|
||||||
Transaction::new(from_keypair, &[], loader, &instruction, last_id, fee)
|
Transaction::new(from_keypair, &[], loader, &instruction, last_id, fee)
|
||||||
}
|
}
|
|
@ -41,7 +41,6 @@ pub mod fullnode;
|
||||||
pub mod leader_scheduler;
|
pub mod leader_scheduler;
|
||||||
pub mod ledger;
|
pub mod ledger;
|
||||||
pub mod ledger_write_stage;
|
pub mod ledger_write_stage;
|
||||||
pub mod loader_transaction;
|
|
||||||
pub mod logger;
|
pub mod logger;
|
||||||
pub mod mint;
|
pub mod mint;
|
||||||
pub mod native_loader;
|
pub mod native_loader;
|
||||||
|
|
|
@ -4,7 +4,6 @@ use chrono::prelude::*;
|
||||||
use clap::ArgMatches;
|
use clap::ArgMatches;
|
||||||
use elf;
|
use elf;
|
||||||
use fullnode::Config;
|
use fullnode::Config;
|
||||||
use loader_transaction::LoaderTransaction;
|
|
||||||
use ring::rand::SystemRandom;
|
use ring::rand::SystemRandom;
|
||||||
use ring::signature::Ed25519KeyPair;
|
use ring::signature::Ed25519KeyPair;
|
||||||
use rpc::RpcSignatureStatus;
|
use rpc::RpcSignatureStatus;
|
||||||
|
@ -15,6 +14,7 @@ use solana_sdk::bpf_loader;
|
||||||
use solana_sdk::budget_program;
|
use solana_sdk::budget_program;
|
||||||
use solana_sdk::budget_transaction::BudgetTransaction;
|
use solana_sdk::budget_transaction::BudgetTransaction;
|
||||||
use solana_sdk::hash::Hash;
|
use solana_sdk::hash::Hash;
|
||||||
|
use solana_sdk::loader_transaction::LoaderTransaction;
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
|
use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
|
||||||
use solana_sdk::transaction::Transaction;
|
use solana_sdk::transaction::Transaction;
|
||||||
|
|
|
@ -5,13 +5,13 @@ extern crate solana;
|
||||||
extern crate solana_sdk;
|
extern crate solana_sdk;
|
||||||
|
|
||||||
use solana::bank::Bank;
|
use solana::bank::Bank;
|
||||||
use solana::loader_transaction::LoaderTransaction;
|
|
||||||
use solana::logger;
|
use solana::logger;
|
||||||
use solana::mint::Mint;
|
use solana::mint::Mint;
|
||||||
use solana::native_loader;
|
use solana::native_loader;
|
||||||
use solana::system_transaction::SystemTransaction;
|
use solana::system_transaction::SystemTransaction;
|
||||||
#[cfg(feature = "bpf_c")]
|
#[cfg(feature = "bpf_c")]
|
||||||
use solana_sdk::bpf_loader;
|
use solana_sdk::bpf_loader;
|
||||||
|
use solana_sdk::loader_transaction::LoaderTransaction;
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
use solana_sdk::signature::{Keypair, KeypairUtil};
|
||||||
use solana_sdk::transaction::Transaction;
|
use solana_sdk::transaction::Transaction;
|
||||||
|
|
Loading…
Reference in New Issue