blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable LocalVoteSignerService. It's grabbing an TCP port that's causing CI to fail occasionally (#5690)

This commit is contained in:
Michael Vines 2019-08-27 15:34:23 -07:00 committed by GitHub
parent 34ab25a88b
commit ffc748becb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
validator/src/main.rs
View File

@ -9,7 +9,6 @@ use solana_core::cluster_info::{Node, FULLNODE_PORT_RANGE};
use solana_core::contact_info::ContactInfo; use solana_core::contact_info::ContactInfo;
use solana_core::gossip_service::discover; use solana_core::gossip_service::discover;
use solana_core::ledger_cleanup_service::DEFAULT_MAX_LEDGER_SLOTS; use solana_core::ledger_cleanup_service::DEFAULT_MAX_LEDGER_SLOTS;
use solana_core::local_vote_signer_service::LocalVoteSignerService;
use solana_core::service::Service; use solana_core::service::Service;
use solana_core::socketaddr; use solana_core::socketaddr;
use solana_core::validator::{Validator, ValidatorConfig}; use solana_core::validator::{Validator, ValidatorConfig};
@ -332,6 +331,7 @@ fn main() {
.long("vote-signer-address") .long("vote-signer-address")
.value_name("HOST:PORT") .value_name("HOST:PORT")
.takes_value(true) .takes_value(true)
.hidden(true) // Don't document this argument to discourage its use
.help("Rendezvous with the vote signer at this RPC end point"), .help("Rendezvous with the vote signer at this RPC end point"),
) )
.arg( .arg(
@ -477,17 +477,23 @@ fn main() {
ContactInfo::new_gossip_entry_point(&entrypoint_addr) ContactInfo::new_gossip_entry_point(&entrypoint_addr)
}); });
let (_signer_service, _signer_addr) = if let Some(signer_addr) = matches.value_of("signer_addr")
{ if matches.value_of("signer_addr").is_some() {
( warn!("--vote-signer-address ignored");
None, /*
signer_addr.to_string().parse().expect("Signer IP Address"), let (_signer_service, _signer_addr) = if let Some(signer_addr) = matches.value_of("signer_addr")
) {
} else { (
// Run a local vote signer if a vote signer service address was not provided None,
let (signer_service, signer_addr) = LocalVoteSignerService::new(dynamic_port_range); signer_addr.to_string().parse().expect("Signer IP Address"),
(Some(signer_service), signer_addr) )
}; } else {
// Run a local vote signer if a vote signer service address was not provided
let (signer_service, signer_addr) = solana_core::local_vote_signer_service::LocalVoteSignerService::new(dynamic_port_range);
(Some(signer_service), signer_addr)
};
*/
}
let init_complete_file = matches.value_of("init_complete_file"); let init_complete_file = matches.value_of("init_complete_file");
let verify_ledger = !matches.is_present("skip_ledger_verify"); let verify_ledger = !matches.is_present("skip_ledger_verify");