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

Synchronize and cleanup instruction processor lists (#5356)

Browse Source
This commit is contained in:
Jack May
2019-07-31 14:28:14 -07:00
committed by GitHub
parent 1d6bafbc77
commit d09afdbefe
13 changed files with 121 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/lib.rs
View File

@ -76,7 +76,6 @@ pub mod window_service;
#[macro_use]
extern crate solana_budget_program;
#[macro_use]
extern crate solana_storage_program;
#[cfg(test)]
@ -101,6 +100,3 @@ extern crate solana_metrics;
extern crate matches;
extern crate crossbeam_channel;
#[macro_use]
extern crate solana_move_loader_program;

12
core/src/local_cluster.rs
View File

@ -30,8 +30,6 @@ use std::io::{Error, ErrorKind, Result};
use std::path::PathBuf;
use std::sync::Arc;
use solana_move_loader_api;
pub struct ValidatorInfo {
pub keypair: Arc<Keypair>,
pub voting_keypair: Arc<Keypair>,
@ -159,17 +157,15 @@ impl LocalCluster {
.native_instruction_processors
.extend_from_slice(&config.native_instruction_processors);
genesis_block
.native_instruction_processors
.extend_from_slice(&solana_genesis_programs::get());
let storage_keypair = Keypair::new();
genesis_block.accounts.push((
storage_keypair.pubkey(),
storage_contract::create_validator_storage_account(leader_pubkey, 1),
));
genesis_block
.native_instruction_processors
.push(solana_storage_program!());
genesis_block
.native_instruction_processors
.push(solana_move_loader_program!());
let (leader_ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_block);
let leader_contact_info = leader_node.info.clone();