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

Account for stake held by the current node while waiting for the supermajority to join gossip

Browse Source
This commit is contained in:
Michael Vines
2020-01-07 20:35:09 -07:00
parent 4b577aa77b
commit 43897de12e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/validator.rs
View File

@ -299,7 +299,7 @@ impl Validator {
if config.wait_for_supermajority { if config.wait_for_supermajority {
info!( info!(
"Waiting more than 66% of activated stake at slot {} to be in gossip...", "Waiting for more than 66% of activated stake at slot {} to be in gossip...",
bank.slot() bank.slot()
); );
loop { loop {
@ -630,6 +630,8 @@ fn get_stake_percent_in_gossip(
activated_stake activated_stake
); );
gossip_stake += activated_stake; gossip_stake += activated_stake;
} else if vote_state.node_pubkey == cluster_info.read().unwrap().id() {
gossip_stake += activated_stake;
} }
} }

2
local-cluster/tests/local_cluster.rs
View File

@ -159,6 +159,8 @@ fn test_validator_exit_2() {
let num_nodes = 2; let num_nodes = 2;
let mut validator_config = ValidatorConfig::default(); let mut validator_config = ValidatorConfig::default();
validator_config.rpc_config.enable_validator_exit = true; validator_config.rpc_config.enable_validator_exit = true;
validator_config.wait_for_supermajority = true;
let config = ClusterConfig { let config = ClusterConfig {
cluster_lamports: 10_000, cluster_lamports: 10_000,
node_stakes: vec![100; num_nodes], node_stakes: vec![100; num_nodes],