gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Runtime object. Allow any number of static loaders.

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-15 20:48:11 -06:00
committed by Grimes
parent 70b45de012
commit ee39f31d81
4 changed files with 201 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
programs/budget/src/budget_program.rs
View File

@ -74,6 +74,7 @@ pub fn process_instruction(
_program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount],
data: &[u8],
_tick_height: u64,
) -> Result<(), ProgramError> {
let instruction = deserialize(data).map_err(|err| {
info!("Invalid transaction data: {:?} {:?}", data, err);
@ -144,7 +145,7 @@ mod test {
use super::*;
use solana_budget_api::budget_transaction::BudgetTransaction;
use solana_budget_api::id;
use solana_runtime::runtime;
use solana_runtime::runtime::Runtime;
use solana_sdk::account::Account;
use solana_sdk::hash::Hash;
use solana_sdk::signature::{Keypair, KeypairUtil};
@ -155,7 +156,9 @@ mod test {
tx: &Transaction,
tx_accounts: &mut Vec<Account>,
) -> Result<(), TransactionError> {
runtime::process_transaction(tx, tx_accounts, process_instruction)
let mut runtime = Runtime::default();
runtime.add_entrypoint(id(), process_instruction);
runtime.process_transaction(tx, tx_accounts)
}
#[test]

4
programs/budget/src/lib.rs
View File

@ -12,11 +12,11 @@ fn entrypoint(
program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount],
data: &[u8],
_tick_height: u64,
tick_height: u64,
) -> Result<(), ProgramError> {
solana_logger::setup();
trace!("process_instruction: {:?}", data);
trace!("keyed_accounts: {:?}", keyed_accounts);
process_instruction(program_id, keyed_accounts, data)
process_instruction(program_id, keyed_accounts, data, tick_height)
}