blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename dynamic_program.rs to native_loader.rs

This commit is contained in:
Jack May 2018-10-16 13:13:17 -07:00 committed by Grimes
parent c886625c83
commit 926fdb7519
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bank.rs
View File

@ -8,7 +8,7 @@ use bincode::serialize;
use budget_program::BudgetState;
use budget_transaction::BudgetTransaction;
use counter::Counter;
use dynamic_program;
use native_loader;
use entry::Entry;
use hash::{hash, Hash};
use itertools::Itertools;
@ -608,7 +608,7 @@ impl Bank {
let mut program_id = tx.program_ids[instruction_index];
loop {
if dynamic_program::check_id(&program_id) {
if native_loader::check_id(&program_id) {
// at the root of the chain, ready to dispatch
break;
}
@ -647,7 +647,7 @@ impl Bank {
}).collect();
keyed_accounts.append(&mut keyed_accounts2);
if !dynamic_program::process_transaction(
if !native_loader::process_transaction(
&mut keyed_accounts,
&tx.instructions[instruction_index].userdata,
) {

2
src/lib.rs
View File

@ -24,7 +24,6 @@ pub mod client;
pub mod cluster_info;
pub mod budget_program;
pub mod drone;
pub mod dynamic_program;
pub mod entry;
pub mod entry_writer;
#[cfg(feature = "erasure")]
@ -38,6 +37,7 @@ pub mod loader_transaction;
pub mod logger;
pub mod metrics;
pub mod mint;
pub mod native_loader;
pub mod ncp;
pub mod netutil;
pub mod packet;

0
src/dynamic_program.rs → src/native_loader.rs
View File

24
tests/programs.rs
View File

@ -5,7 +5,7 @@ extern crate solana_program_interface;
use bincode::serialize;
use solana::bank::Bank;
use solana::dynamic_program;
use solana::native_loader;
use solana::loader_transaction::LoaderTransaction;
use solana::logger;
use solana::mint::Mint;
@ -40,25 +40,25 @@ fn test_transaction_load_native() {
mint.last_id(),
1,
56, // TODO How does the user know how much space to allocate, this is really an internally known size
dynamic_program::id(),
native_loader::id(),
0,
);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
println!("id: {:?}", dynamic_program::id());
println!("id: {:?}", native_loader::id());
let name = String::from("noop");
let tx = Transaction::write(
&program,
dynamic_program::id(),
native_loader::id(),
0,
name.as_bytes().to_vec(),
mint.last_id(),
0,
);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
println!("id after: {:?}", dynamic_program::id());
println!("id after: {:?}", native_loader::id());
let tx = Transaction::finalize(&program, dynamic_program::id(), mint.last_id(), 0);
let tx = Transaction::finalize(&program, native_loader::id(), mint.last_id(), 0);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
// Call user program
@ -95,7 +95,7 @@ fn test_transaction_load_lua() {
mint.last_id(),
1,
56, // TODO How does the user know how much space to allocate for what should be an internally known size
dynamic_program::id(),
native_loader::id(),
0,
);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
@ -103,7 +103,7 @@ fn test_transaction_load_lua() {
let name = String::from("solua");
let tx = Transaction::write(
&loader,
dynamic_program::id(),
native_loader::id(),
0,
name.as_bytes().to_vec(),
mint.last_id(),
@ -111,7 +111,7 @@ fn test_transaction_load_lua() {
);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
let tx = Transaction::finalize(&loader, dynamic_program::id(), mint.last_id(), 0);
let tx = Transaction::finalize(&loader, native_loader::id(), mint.last_id(), 0);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
// allocate, populate, and finalize user program
@ -192,7 +192,7 @@ fn test_transaction_load_bpf() {
mint.last_id(),
1,
56, // TODO How does the user know how much space to allocate for what should be an internally known size
dynamic_program::id(),
native_loader::id(),
0,
);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
@ -200,7 +200,7 @@ fn test_transaction_load_bpf() {
let name = String::from("sobpf");
let tx = Transaction::write(
&loader,
dynamic_program::id(),
native_loader::id(),
0,
name.as_bytes().to_vec(),
mint.last_id(),
@ -208,7 +208,7 @@ fn test_transaction_load_bpf() {
);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
let tx = Transaction::finalize(&loader, dynamic_program::id(), mint.last_id(), 0);
let tx = Transaction::finalize(&loader, native_loader::id(), mint.last_id(), 0);
check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
// allocate, populate, and finalize user program