Rename genesis block to genesis config (#6816)

core/benches/banking_stage.rs

@@ -11,7 +11,7 @@ use rayon::prelude::*;
 use solana_core::banking_stage::{create_test_recorder, BankingStage};
 use solana_core::cluster_info::ClusterInfo;
 use solana_core::cluster_info::Node;
-use solana_core::genesis_utils::{create_genesis_block, GenesisBlockInfo};
+use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_core::packet::to_packets_chunked;
 use solana_core::poh_recorder::WorkingBankEntry;
 use solana_core::service::Service;
@@ -20,7 +20,7 @@ use solana_ledger::blocktree_processor::process_entries;
 use solana_ledger::entry::{next_hash, Entry};
 use solana_perf::test_tx::test_tx;
 use solana_runtime::bank::Bank;
-use solana_sdk::genesis_block::GenesisBlock;
+use solana_sdk::genesis_config::GenesisConfig;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Keypair;
@@ -55,8 +55,8 @@ fn check_txs(receiver: &Arc<Receiver<WorkingBankEntry>>, ref_tx_count: usize) {
 
 #[bench]
 fn bench_consume_buffered(bencher: &mut Bencher) {
-    let GenesisBlockInfo { genesis_block, .. } = create_genesis_block(100_000);
-    let bank = Arc::new(Bank::new(&genesis_block));
+    let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100_000);
+    let bank = Arc::new(Bank::new(&genesis_config));
     let ledger_path = get_tmp_ledger_path!();
     let my_pubkey = Pubkey::new_rand();
     {
@@ -139,25 +139,25 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
     const PACKETS_PER_BATCH: usize = 192;
     let txes = PACKETS_PER_BATCH * num_threads * CHUNKS;
     let mint_total = 1_000_000_000_000;
-    let GenesisBlockInfo {
-        mut genesis_block,
+    let GenesisConfigInfo {
+        mut genesis_config,
         mint_keypair,
         ..
-    } = create_genesis_block(mint_total);
+    } = create_genesis_config(mint_total);
 
     // Set a high ticks_per_slot so we don't run out of ticks
     // during the benchmark
-    genesis_block.ticks_per_slot = 10_000;
+    genesis_config.ticks_per_slot = 10_000;
 
     let (verified_sender, verified_receiver) = unbounded();
     let (vote_sender, vote_receiver) = unbounded();
-    let bank = Arc::new(Bank::new(&genesis_block));
+    let bank = Arc::new(Bank::new(&genesis_config));
 
     debug!("threads: {} txs: {}", num_threads, txes);
 
     let transactions = match tx_type {
-        TransactionType::Accounts => make_accounts_txs(txes, &mint_keypair, genesis_block.hash()),
-        TransactionType::Programs => make_programs_txs(txes, genesis_block.hash()),
+        TransactionType::Accounts => make_accounts_txs(txes, &mint_keypair, genesis_config.hash()),
+        TransactionType::Programs => make_programs_txs(txes, genesis_config.hash()),
     };
 
     // fund all the accounts
@@ -166,7 +166,7 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
             &mint_keypair,
             &tx.message.account_keys[0],
             mint_total / txes as u64,
-            genesis_block.hash(),
+            genesis_config.hash(),
         );
         let x = bank.process_transaction(&fund);
         x.unwrap();
@@ -262,12 +262,12 @@ fn simulate_process_entries(
     randomize_txs: bool,
     mint_keypair: &Keypair,
     mut tx_vector: Vec<Transaction>,
-    genesis_block: &GenesisBlock,
+    genesis_config: &GenesisConfig,
     keypairs: &Vec<Keypair>,
     initial_lamports: u64,
     num_accounts: usize,
 ) {
-    let bank = Arc::new(Bank::new(genesis_block));
+    let bank = Arc::new(Bank::new(genesis_config));
 
     for i in 0..(num_accounts / 2) {
         bank.transfer(initial_lamports, mint_keypair, &keypairs[i * 2].pubkey())
@@ -301,11 +301,11 @@ fn bench_process_entries(randomize_txs: bool, bencher: &mut Bencher) {
     // number of accounts need to be in multiple of 4 for correct
     // execution of the test.
     let num_accounts = entropy_multiplier * 4;
-    let GenesisBlockInfo {
-        genesis_block,
+    let GenesisConfigInfo {
+        genesis_config,
         mint_keypair,
         ..
-    } = create_genesis_block((num_accounts + 1) as u64 * initial_lamports);
+    } = create_genesis_config((num_accounts + 1) as u64 * initial_lamports);
 
     let mut keypairs: Vec<Keypair> = vec![];
     let tx_vector: Vec<Transaction> = Vec::with_capacity(num_accounts / 2);
@@ -320,7 +320,7 @@ fn bench_process_entries(randomize_txs: bool, bencher: &mut Bencher) {
             randomize_txs,
             &mint_keypair,
             tx_vector.clone(),
-            &genesis_block,
+            &genesis_config,
             &keypairs,
             initial_lamports,
             num_accounts,

core/benches/retransmit_stage.rs

@@ -6,7 +6,7 @@ extern crate test;
 use log::*;
 use solana_core::cluster_info::{ClusterInfo, Node};
 use solana_core::contact_info::ContactInfo;
-use solana_core::genesis_utils::{create_genesis_block, GenesisBlockInfo};
+use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_core::packet::to_packets_chunked;
 use solana_core::retransmit_stage::retransmitter;
 use solana_ledger::bank_forks::BankForks;
@@ -47,8 +47,8 @@ fn bench_retransmitter(bencher: &mut Bencher) {
     let peer_sockets = Arc::new(peer_sockets);
     let cluster_info = Arc::new(RwLock::new(cluster_info));
 
-    let GenesisBlockInfo { genesis_block, .. } = create_genesis_block(100_000);
-    let bank0 = Bank::new(&genesis_block);
+    let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100_000);
+    let bank0 = Bank::new(&genesis_config);
     let bank_forks = BankForks::new(0, bank0);
     let bank = bank_forks.working_bank();
     let bank_forks = Arc::new(RwLock::new(bank_forks));