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 system_program to system_instrution_processor

This commit is contained in:
Greg Fitzgerald 2019-04-02 08:36:10 -06:00
parent 0a9f063d3e
commit 947cdd8748
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/lib.rs
View File

@ -9,7 +9,7 @@ pub mod locked_accounts_results;
mod native_loader; mod native_loader;
pub mod runtime; pub mod runtime;
mod status_cache; mod status_cache;
mod system_program; mod system_instruction_processor;
#[macro_use] #[macro_use]
extern crate solana_metrics; extern crate solana_metrics;

7
runtime/src/runtime.rs
View File

@ -1,4 +1,5 @@
use crate::native_loader; use crate::native_loader;
use crate::system_instruction_processor;
use solana_sdk::account::{create_keyed_accounts, Account, KeyedAccount}; use solana_sdk::account::{create_keyed_accounts, Account, KeyedAccount};
use solana_sdk::instruction::InstructionError; use solana_sdk::instruction::InstructionError;
use solana_sdk::message::Message; use solana_sdk::message::Message;
@ -90,8 +91,10 @@ pub struct Runtime {
impl Default for Runtime { impl Default for Runtime {
fn default() -> Self { fn default() -> Self {
let instruction_processors: Vec<(Pubkey, ProcessInstruction)> = let instruction_processors: Vec<(Pubkey, ProcessInstruction)> = vec![(
vec![(system_program::id(), crate::system_program::entrypoint)]; system_program::id(),
system_instruction_processor::process_instruction,
)];
Self { Self {
instruction_processors, instruction_processors,

4
runtime/src/system_program.rs → runtime/src/system_instruction_processor.rs
View File

@ -64,7 +64,7 @@ fn move_lamports(keyed_accounts: &mut [KeyedAccount], lamports: u64) -> Result<(
Ok(()) Ok(())
} }
pub fn entrypoint( pub fn process_instruction(
_program_id: &Pubkey, _program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount], keyed_accounts: &mut [KeyedAccount],
data: &[u8], data: &[u8],
@ -243,7 +243,7 @@ mod tests {
program_id: another_program_owner, program_id: another_program_owner,
}; };
let data = serialize(&instruction).unwrap(); let data = serialize(&instruction).unwrap();
let result = entrypoint(&system_program::id(), &mut keyed_accounts, &data, 0); let result = process_instruction(&system_program::id(), &mut keyed_accounts, &data, 0);
assert_eq!(result, Err(InstructionError::IncorrectProgramId)); assert_eq!(result, Err(InstructionError::IncorrectProgramId));
assert_eq!(from_account.owner, new_program_owner); assert_eq!(from_account.owner, new_program_owner);
} }