From 912eb5e8e97407c079c8727192fc278af8181a52 Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Tue, 16 Oct 2018 15:26:44 -0700 Subject: [PATCH] remove bank.is_leader, dead code (#1516) --- src/bank.rs | 20 -------------------- src/fullnode.rs | 2 +- src/leader_scheduler.rs | 2 +- src/write_stage.rs | 6 +++--- 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/bank.rs b/src/bank.rs index bae752fd0d..5f9321be56 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -145,10 +145,6 @@ pub struct Bank { /// start of the ledger. transaction_count: AtomicUsize, - /// This bool allows us to submit metrics that are specific for leaders or validators - /// It is set to `true` by fullnode before creating the bank. - pub is_leader: bool, - // The latest finality time for the network finality_time: AtomicUsize, @@ -175,7 +171,6 @@ impl Default for Bank { account_locks: Mutex::new(HashSet::new()), last_ids_q: RwLock::new(LastIdsQ::default()), transaction_count: AtomicUsize::new(0), - is_leader: true, finality_time: AtomicUsize::new(std::usize::MAX), account_subscriptions: RwLock::new(HashMap::new()), signature_subscriptions: RwLock::new(HashMap::new()), @@ -184,12 +179,6 @@ impl Default for Bank { } impl Bank { - /// Create a default Bank - pub fn new_default(is_leader: bool) -> Self { - let mut bank = Bank::default(); - bank.is_leader = is_leader; - bank - } /// Create an Bank using a deposit. pub fn new_from_deposit(deposit: &Payment) -> Self { let bank = Self::default(); @@ -1759,15 +1748,6 @@ mod tests { assert_eq!(bank.get_balance(&mint.pubkey()), 1); } - #[test] - fn test_new_default() { - let def_bank = Bank::default(); - assert!(def_bank.is_leader); - let leader_bank = Bank::new_default(true); - assert!(leader_bank.is_leader); - let validator_bank = Bank::new_default(false); - assert!(!validator_bank.is_leader); - } #[test] fn test_hash_internal_state() { let mint = Mint::new(2_000); diff --git a/src/fullnode.rs b/src/fullnode.rs index de604d110a..9cb5c438fd 100644 --- a/src/fullnode.rs +++ b/src/fullnode.rs @@ -553,7 +553,7 @@ impl Fullnode { ledger_path: &str, leader_scheduler: &mut LeaderScheduler, ) -> (Bank, u64, Vec) { - let bank = Bank::new_default(false); + let bank = Bank::default(); let entries = read_ledger(ledger_path, true).expect("opening ledger"); let entries = entries .map(|e| e.unwrap_or_else(|err| panic!("failed to parse entry. error: {}", err))); diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs index 605d857422..66d800e6c9 100644 --- a/src/leader_scheduler.rs +++ b/src/leader_scheduler.rs @@ -949,7 +949,7 @@ mod tests { // Check that the generate_schedule() function is being called by the // update_height() function at the correct entry heights. - let bank = Bank::new_default(false); + let bank = Bank::default(); leader_scheduler.update_height(bootstrap_height - 1, &bank); assert_eq!(leader_scheduler.last_seed_height, None); leader_scheduler.update_height(bootstrap_height, &bank); diff --git a/src/write_stage.rs b/src/write_stage.rs index 5410de8190..e2e381d9d8 100644 --- a/src/write_stage.rs +++ b/src/write_stage.rs @@ -369,7 +369,7 @@ mod tests { let cluster_info = Arc::new(RwLock::new( ClusterInfo::new(leader_info.info).expect("ClusterInfo::new"), )); - let bank = Arc::new(Bank::new_default(true)); + let bank = Arc::new(Bank::default()); // Make a ledger let (_, leader_ledger_path) = genesis(test_name, 10_000); @@ -516,7 +516,7 @@ mod tests { let my_id = my_keypair.pubkey(); // Set up a dummy bank - let bank = Arc::new(Bank::new_default(true)); + let bank = Arc::new(Bank::default()); let accounts = bank.accounts(); let dummy_id = Keypair::new().pubkey(); let new_account = Account::new(1, 10, dummy_id.clone()); @@ -610,7 +610,7 @@ mod tests { let my_id = my_keypair.pubkey(); // Set up a dummy bank - let bank = Arc::new(Bank::new_default(true)); + let bank = Arc::new(Bank::default()); let entry = Entry::new(&Hash::default(), 0, vec![]); // Note: An slot is the period of leader_rotation_interval entries