From d08517db8c46e7ca57f578a31315459a46858679 Mon Sep 17 00:00:00 2001 From: Jack May Date: Sat, 18 Apr 2020 22:39:08 -0700 Subject: [PATCH] Nit picks (#9580) --- programs/bpf/tests/programs.rs | 14 ++++++++++---- runtime/src/message_processor.rs | 10 ++++------ sdk/bpf/c/inc/solana_sdk.h | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs index a39fdb9a8..877e10489 100644 --- a/programs/bpf/tests/programs.rs +++ b/programs/bpf/tests/programs.rs @@ -1,5 +1,6 @@ #[cfg(any(feature = "bpf_c", feature = "bpf_rust"))] mod bpf { + use solana_bpf_loader_program::solana_bpf_loader_program; use solana_runtime::{ bank::Bank, bank_client::BankClient, @@ -18,7 +19,6 @@ mod bpf { sysvar::{clock, fees, rent, rewards, slot_hashes, stake_history}, transaction::TransactionError, }; - use solana_bpf_loader_program::solana_bpf_loader_program; use std::{env, fs::File, io::Read, path::PathBuf, sync::Arc}; /// BPF program file extension @@ -88,7 +88,9 @@ mod bpf { mint_keypair, .. } = create_genesis_config(50); - genesis_config.native_instruction_processors.push(solana_bpf_loader_program!()); + genesis_config + .native_instruction_processors + .push(solana_bpf_loader_program!()); let bank = Arc::new(Bank::new(&genesis_config)); // Create bank with specific slot, used by solana_bpf_rust_sysvar test let bank = @@ -139,7 +141,9 @@ mod bpf { mint_keypair, .. } = create_genesis_config(50); - genesis_config.native_instruction_processors.push(solana_bpf_loader_program!()); + genesis_config + .native_instruction_processors + .push(solana_bpf_loader_program!()); let bank = Arc::new(Bank::new(&genesis_config)); let bank_client = BankClient::new_shared(&bank); let program_id = load_bpf_program(&bank_client, &mint_keypair, program); @@ -222,7 +226,9 @@ mod bpf { mint_keypair, .. } = create_genesis_config(50); - genesis_config.native_instruction_processors.push(solana_bpf_loader_program!()); + genesis_config + .native_instruction_processors + .push(solana_bpf_loader_program!()); let bank = Bank::new(&genesis_config); let bank_client = BankClient::new(bank); let program_id = load_bpf_program(&bank_client, &mint_keypair, program); diff --git a/runtime/src/message_processor.rs b/runtime/src/message_processor.rs index 3d376977b..5506c7bda 100644 --- a/runtime/src/message_processor.rs +++ b/runtime/src/message_processor.rs @@ -170,13 +170,11 @@ pub struct MessageProcessor { } impl Default for MessageProcessor { fn default() -> Self { - let instruction_processors: Vec<(Pubkey, ProcessInstruction)> = vec![( - system_program::id(), - system_instruction_processor::process_instruction, - )]; - Self { - instruction_processors, + instruction_processors: vec![( + system_program::id(), + system_instruction_processor::process_instruction, + )], native_loader: NativeLoader::default(), } } diff --git a/sdk/bpf/c/inc/solana_sdk.h b/sdk/bpf/c/inc/solana_sdk.h index 8fd696a1a..bb1702c00 100644 --- a/sdk/bpf/c/inc/solana_sdk.h +++ b/sdk/bpf/c/inc/solana_sdk.h @@ -268,7 +268,7 @@ typedef struct { * instead it populates the pointers and lengths in SolAccountInfo and data so * that any modification to lamports or account data take place on the original * buffer. Doing so also eliminates the need to serialize back into the buffer - * at program end. + * at the end of the program. * * @param input Source buffer containing serialized input parameters * @param params Pointer to a SolParameters structure