remove bank.is_leader, dead code (#1516)
This commit is contained in:
parent
bb628e8495
commit
912eb5e8e9
20
src/bank.rs
20
src/bank.rs
|
@ -145,10 +145,6 @@ pub struct Bank {
|
||||||
/// start of the ledger.
|
/// start of the ledger.
|
||||||
transaction_count: AtomicUsize,
|
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
|
// The latest finality time for the network
|
||||||
finality_time: AtomicUsize,
|
finality_time: AtomicUsize,
|
||||||
|
|
||||||
|
@ -175,7 +171,6 @@ impl Default for Bank {
|
||||||
account_locks: Mutex::new(HashSet::new()),
|
account_locks: Mutex::new(HashSet::new()),
|
||||||
last_ids_q: RwLock::new(LastIdsQ::default()),
|
last_ids_q: RwLock::new(LastIdsQ::default()),
|
||||||
transaction_count: AtomicUsize::new(0),
|
transaction_count: AtomicUsize::new(0),
|
||||||
is_leader: true,
|
|
||||||
finality_time: AtomicUsize::new(std::usize::MAX),
|
finality_time: AtomicUsize::new(std::usize::MAX),
|
||||||
account_subscriptions: RwLock::new(HashMap::new()),
|
account_subscriptions: RwLock::new(HashMap::new()),
|
||||||
signature_subscriptions: RwLock::new(HashMap::new()),
|
signature_subscriptions: RwLock::new(HashMap::new()),
|
||||||
|
@ -184,12 +179,6 @@ impl Default for Bank {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl 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.
|
/// Create an Bank using a deposit.
|
||||||
pub fn new_from_deposit(deposit: &Payment) -> Self {
|
pub fn new_from_deposit(deposit: &Payment) -> Self {
|
||||||
let bank = Self::default();
|
let bank = Self::default();
|
||||||
|
@ -1759,15 +1748,6 @@ mod tests {
|
||||||
assert_eq!(bank.get_balance(&mint.pubkey()), 1);
|
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]
|
#[test]
|
||||||
fn test_hash_internal_state() {
|
fn test_hash_internal_state() {
|
||||||
let mint = Mint::new(2_000);
|
let mint = Mint::new(2_000);
|
||||||
|
|
|
@ -553,7 +553,7 @@ impl Fullnode {
|
||||||
ledger_path: &str,
|
ledger_path: &str,
|
||||||
leader_scheduler: &mut LeaderScheduler,
|
leader_scheduler: &mut LeaderScheduler,
|
||||||
) -> (Bank, u64, Vec<Entry>) {
|
) -> (Bank, u64, Vec<Entry>) {
|
||||||
let bank = Bank::new_default(false);
|
let bank = Bank::default();
|
||||||
let entries = read_ledger(ledger_path, true).expect("opening ledger");
|
let entries = read_ledger(ledger_path, true).expect("opening ledger");
|
||||||
let entries = entries
|
let entries = entries
|
||||||
.map(|e| e.unwrap_or_else(|err| panic!("failed to parse entry. error: {}", err)));
|
.map(|e| e.unwrap_or_else(|err| panic!("failed to parse entry. error: {}", err)));
|
||||||
|
|
|
@ -949,7 +949,7 @@ mod tests {
|
||||||
|
|
||||||
// Check that the generate_schedule() function is being called by the
|
// Check that the generate_schedule() function is being called by the
|
||||||
// update_height() function at the correct entry heights.
|
// 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);
|
leader_scheduler.update_height(bootstrap_height - 1, &bank);
|
||||||
assert_eq!(leader_scheduler.last_seed_height, None);
|
assert_eq!(leader_scheduler.last_seed_height, None);
|
||||||
leader_scheduler.update_height(bootstrap_height, &bank);
|
leader_scheduler.update_height(bootstrap_height, &bank);
|
||||||
|
|
|
@ -369,7 +369,7 @@ mod tests {
|
||||||
let cluster_info = Arc::new(RwLock::new(
|
let cluster_info = Arc::new(RwLock::new(
|
||||||
ClusterInfo::new(leader_info.info).expect("ClusterInfo::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
|
// Make a ledger
|
||||||
let (_, leader_ledger_path) = genesis(test_name, 10_000);
|
let (_, leader_ledger_path) = genesis(test_name, 10_000);
|
||||||
|
@ -516,7 +516,7 @@ mod tests {
|
||||||
let my_id = my_keypair.pubkey();
|
let my_id = my_keypair.pubkey();
|
||||||
|
|
||||||
// Set up a dummy bank
|
// Set up a dummy bank
|
||||||
let bank = Arc::new(Bank::new_default(true));
|
let bank = Arc::new(Bank::default());
|
||||||
let accounts = bank.accounts();
|
let accounts = bank.accounts();
|
||||||
let dummy_id = Keypair::new().pubkey();
|
let dummy_id = Keypair::new().pubkey();
|
||||||
let new_account = Account::new(1, 10, dummy_id.clone());
|
let new_account = Account::new(1, 10, dummy_id.clone());
|
||||||
|
@ -610,7 +610,7 @@ mod tests {
|
||||||
let my_id = my_keypair.pubkey();
|
let my_id = my_keypair.pubkey();
|
||||||
|
|
||||||
// Set up a dummy bank
|
// 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![]);
|
let entry = Entry::new(&Hash::default(), 0, vec![]);
|
||||||
|
|
||||||
// Note: An slot is the period of leader_rotation_interval entries
|
// Note: An slot is the period of leader_rotation_interval entries
|
||||||
|
|
Loading…
Reference in New Issue