Boot the Builder pattern from GenesisBlock (solana-labs#6364)

CASABECI · Oct 15, 2019 · ae41c88 · ae41c88
1 parent 41067de
commit ae41c88
Show file tree

Hide file tree

Showing 12 changed files with 216 additions and 273 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bench-exchange/src/bench.rs b/bench-exchange/src/bench.rs
@@ -11,7 +11,7 @@ use solana_drone::drone::request_airdrop_transaction;
 use solana_exchange_api::exchange_instruction;
 use solana_exchange_api::exchange_state::*;
 use solana_exchange_api::id;
-use solana_genesis::PrimordialAccountDetails;
+use solana_genesis::Base64Account;
 use solana_metrics::datapoint_info;
 use solana_sdk::client::Client;
 use solana_sdk::client::SyncClient;
@@ -89,7 +89,7 @@ pub fn create_client_accounts_file(
     keypairs.iter().for_each(|keypair| {
         accounts.insert(
             serde_json::to_string(&keypair.to_bytes().to_vec()).unwrap(),
-            PrimordialAccountDetails {
+            Base64Account {
                 balance: fund_amount,
                 executable: false,
                 owner: system_program::id().to_string(),
@@ -140,8 +140,7 @@ where
         let path = Path::new(&client_ids_and_stake_file);
         let file = File::open(path).unwrap();
 
-        let accounts: HashMap<String, PrimordialAccountDetails> =
-            serde_yaml::from_reader(file).unwrap();
+        let accounts: HashMap<String, Base64Account> = serde_yaml::from_reader(file).unwrap();
         accounts
             .into_iter()
             .map(|(keypair, _)| {

diff --git a/bench-tps/src/main.rs b/bench-tps/src/main.rs
@@ -2,7 +2,7 @@ use log::*;
 use solana_bench_tps::bench::{do_bench_tps, generate_and_fund_keypairs, generate_keypairs};
 use solana_bench_tps::cli;
 use solana_core::gossip_service::{discover_cluster, get_multi_client};
-use solana_genesis::PrimordialAccountDetails;
+use solana_genesis::Base64Account;
 use solana_sdk::fee_calculator::FeeCalculator;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::system_program;
@@ -46,7 +46,7 @@ fn main() {
         keypairs.iter().for_each(|keypair| {
             accounts.insert(
                 serde_json::to_string(&keypair.to_bytes().to_vec()).unwrap(),
-                PrimordialAccountDetails {
+                Base64Account {
                     balance: num_lamports_per_account,
                     executable: false,
                     owner: system_program::id().to_string(),
@@ -85,8 +85,7 @@ fn main() {
         let file = File::open(path).unwrap();
 
         info!("Reading {}", client_ids_and_stake_file);
-        let accounts: HashMap<String, PrimordialAccountDetails> =
-            serde_yaml::from_reader(file).unwrap();
+        let accounts: HashMap<String, Base64Account> = serde_yaml::from_reader(file).unwrap();
         let mut keypairs = vec![];
         let mut last_balance = 0;
 

diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
@@ -10,7 +10,6 @@ homepage = "https://solana.com/"
 
 [dependencies]
 base64 = "0.10.1"
-bincode = "1.2.0"
 clap = "2.33.0"
 serde = "1.0.101"
 serde_derive = "1.0.101"
@@ -23,5 +22,3 @@ solana-stake-api = { path = "../programs/stake_api", version = "0.20.0" }
 solana-storage-api = { path = "../programs/storage_api", version = "0.20.0" }
 solana-vote-api = { path = "../programs/vote_api", version = "0.20.0" }
 tempfile = "3.1.0"
-sys-info = "0.5.8"
-rayon = "1.2.0"
diff --git a/genesis/src/lib.rs b/genesis/src/lib.rs
@@ -1,7 +1,8 @@
 use serde::{Deserialize, Serialize};
 
+/// An account where the data is encoded as a Base64 string.
 #[derive(Serialize, Deserialize, Debug)]
-pub struct PrimordialAccountDetails {
+pub struct Base64Account {
     pub balance: u64,
     pub owner: String,
     pub data: String,