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

7
core/Cargo.toml
View File

@ -50,10 +50,9 @@ solana-budget-api = { path = "../programs/budget_api", version = "0.18.0-pre0" }
solana-budget-program = { path = "../programs/budget_program", version = "0.18.0-pre0" }
solana-chacha-sys = { path = "../chacha-sys", version = "0.18.0-pre0" }
solana-client = { path = "../client", version = "0.18.0-pre0" }
solana-config-program = { path = "../programs/config_program", version = "0.18.0-pre0" }
solana-drone = { path = "../drone", version = "0.18.0-pre0" }
solana-ed25519-dalek = "0.2.0"
solana-exchange-program = { path = "../programs/exchange_program", version = "0.18.0-pre0" }
solana-genesis-programs = { path = "../genesis_programs", version = "0.18.0-pre0" }
solana-kvstore = { path = "../kvstore", version = "0.18.0-pre0", optional = true }
solana-logger = { path = "../logger", version = "0.18.0-pre0" }
solana-merkle-tree = { path = "../merkle-tree", version = "0.18.0-pre0" }
@ -63,14 +62,10 @@ solana-netutil = { path = "../netutil", version = "0.18.0-pre0" }
solana-runtime = { path = "../runtime", version = "0.18.0-pre0" }
solana-sdk = { path = "../sdk", version = "0.18.0-pre0" }
solana-stake-api = { path = "../programs/stake_api", version = "0.18.0-pre0" }
solana-stake-program = { path = "../programs/stake_program", version = "0.18.0-pre0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.18.0-pre0" }
solana-storage-program = { path = "../programs/storage_program", version = "0.18.0-pre0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.18.0-pre0" }
solana-vote-program = { path = "../programs/vote_program", version = "0.18.0-pre0" }
solana-vote-signer = { path = "../vote-signer", version = "0.18.0-pre0" }
solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.18.0-pre0" }
solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.18.0-pre0" }
solana-librapay-api = { path = "../programs/librapay_api", version = "0.18.0-pre0" }
sys-info = "0.5.7"
tokio = "0.1"

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();