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

46
genesis/src/main.rs
View File

@ -1,20 +1,4 @@
//! A command-line executable for generating the chain's genesis block.
#[macro_use]
extern crate solana_bpf_loader_program;
#[macro_use]
extern crate solana_vote_program;
#[macro_use]
extern crate solana_stake_program;
#[macro_use]
extern crate solana_budget_program;
#[macro_use]
extern crate solana_token_program;
#[macro_use]
extern crate solana_config_program;
#[macro_use]
extern crate solana_exchange_program;
#[macro_use]
extern crate solana_storage_program;
use clap::{crate_description, crate_name, crate_version, value_t_or_exit, App, Arg};
use solana::blocktree::create_new_ledger;
@ -299,16 +283,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
),
),
])
.native_instruction_processors(&[
solana_bpf_loader_program!(),
solana_vote_program!(),
solana_stake_program!(),
solana_budget_program!(),
solana_token_program!(),
solana_config_program!(),
solana_exchange_program!(),
solana_storage_program!(),
])
.native_instruction_processors(&solana_genesis_programs::get())
.ticks_per_slot(value_t_or_exit!(matches, "ticks_per_slot", u64))
.slots_per_epoch(value_t_or_exit!(matches, "slots_per_epoch", u64));
@ -367,7 +342,6 @@ fn main() -> Result<(), Box<dyn error::Error>> {
#[cfg(test)]
mod tests {
use super::*;
use hashbrown::HashSet;
use solana_sdk::genesis_block::Builder;
use solana_sdk::pubkey::Pubkey;
use std::collections::HashMap;
@ -375,24 +349,6 @@ mod tests {
use std::io::Write;
use std::path::Path;
#[test]
fn test_program_id_uniqueness() {
let mut unique = HashSet::new();
let ids = vec![
solana_sdk::system_program::id(),
solana_sdk::native_loader::id(),
solana_sdk::bpf_loader::id(),
solana_budget_api::id(),
solana_storage_api::id(),
solana_token_api::id(),
solana_vote_api::id(),
solana_stake_api::id(),
solana_config_api::id(),
solana_exchange_api::id(),
];
assert!(ids.into_iter().all(move |id| unique.insert(id)));
}
#[test]
fn test_append_primordial_accounts_to_genesis() {
// Test invalid file returns error