gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TestValidator public interface cleanup

Browse Source
This commit is contained in:
Michael Vines
2020-11-25 14:14:45 -08:00
parent 5e2d38227f
commit b5f7e39be8
14 changed files with 92 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ledger/src/leader_schedule_cache.rs
View File

@ -267,7 +267,6 @@ mod tests {
staking_utils::tests::setup_vote_and_stake_accounts,
};
use solana_runtime::bank::Bank;
use solana_runtime::genesis_utils::BOOTSTRAP_VALIDATOR_LAMPORTS;
use solana_sdk::clock::NUM_CONSECUTIVE_LEADER_SLOTS;
use solana_sdk::epoch_schedule::{
EpochSchedule, DEFAULT_LEADER_SCHEDULE_SLOT_OFFSET, DEFAULT_SLOTS_PER_EPOCH,
@ -380,12 +379,9 @@ mod tests {
#[test]
fn test_next_leader_slot() {
let pubkey = solana_sdk::pubkey::new_rand();
let mut genesis_config = create_genesis_config_with_leader(
BOOTSTRAP_VALIDATOR_LAMPORTS,
&pubkey,
bootstrap_validator_stake_lamports(),
)
.genesis_config;
let mut genesis_config =
create_genesis_config_with_leader(42, &pubkey, bootstrap_validator_stake_lamports())
.genesis_config;
genesis_config.epoch_schedule = EpochSchedule::custom(
DEFAULT_SLOTS_PER_EPOCH,
DEFAULT_LEADER_SCHEDULE_SLOT_OFFSET,
@ -433,12 +429,9 @@ mod tests {
#[test]
fn test_next_leader_slot_blockstore() {
let pubkey = solana_sdk::pubkey::new_rand();
let mut genesis_config = create_genesis_config_with_leader(
BOOTSTRAP_VALIDATOR_LAMPORTS,
&pubkey,
bootstrap_validator_stake_lamports(),
)
.genesis_config;
let mut genesis_config =
create_genesis_config_with_leader(42, &pubkey, bootstrap_validator_stake_lamports())
.genesis_config;
genesis_config.epoch_schedule.warmup = false;
let bank = Bank::new(&genesis_config);

10
ledger/src/leader_schedule_utils.rs
View File

@ -56,7 +56,6 @@ mod tests {
use super::*;
use solana_runtime::genesis_utils::{
bootstrap_validator_stake_lamports, create_genesis_config_with_leader,
BOOTSTRAP_VALIDATOR_LAMPORTS,
};
#[test]
@ -84,12 +83,9 @@ mod tests {
#[test]
fn test_leader_scheduler1_basic() {
let pubkey = solana_sdk::pubkey::new_rand();
let genesis_config = create_genesis_config_with_leader(
BOOTSTRAP_VALIDATOR_LAMPORTS,
&pubkey,
bootstrap_validator_stake_lamports(),
)
.genesis_config;
let genesis_config =
create_genesis_config_with_leader(42, &pubkey, bootstrap_validator_stake_lamports())
.genesis_config;
let bank = Bank::new(&genesis_config);
assert_eq!(slot_leader_at(bank.slot(), &bank).unwrap(), pubkey);
}