cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix #1964: remove mainnet warnings which no longer apply (#1970)

Browse Source 
## Issue Addressed

#1964

## Proposed Changes

* remove two mainnet warnings
* reword `testnet` in logmessage
* update test
This commit is contained in:
SjonHortensius 2020-11-25 23:56:21 +00:00
parent 198c4a873d
commit 50558e61f7
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
account_manager/src/validator/create.rs
View File

@ -25,8 +25,6 @@ pub const STORE_WITHDRAW_FLAG: &str = "store-withdrawal-keystore";
pub const COUNT_FLAG: &str = "count"; pub const COUNT_FLAG: &str = "count";
pub const AT_MOST_FLAG: &str = "at-most"; pub const AT_MOST_FLAG: &str = "at-most";
pub const WALLET_PASSWORD_PROMPT: &str = "Enter your wallet's password:"; pub const WALLET_PASSWORD_PROMPT: &str = "Enter your wallet's password:";
pub const MAINNET_WARNING: &str = "These are *not* mainnet validators! Submitting a mainnet \
deposit for this validator will result in lost ETH.";
pub fn cli_app<'a, 'b>() -> App<'a, 'b> { pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
App::new(CMD) App::new(CMD)
@ -239,8 +237,6 @@ pub fn cli_run<T: EthSpec>(
.map_err(|e| format!("Unable to build validator directory: {:?}", e))?; .map_err(|e| format!("Unable to build validator directory: {:?}", e))?;
println!("{}/{}\t{}", i + 1, n, voting_pubkey.to_hex_string()); println!("{}/{}\t{}", i + 1, n, voting_pubkey.to_hex_string());
println!("{}", MAINNET_WARNING);
} }
Ok(()) Ok(())

9
lighthouse/src/main.rs
View File

@ -266,17 +266,10 @@ fn run<E: EthSpec>(
info!(log, "Lighthouse started"; "version" => VERSION); info!(log, "Lighthouse started"; "version" => VERSION);
info!( info!(
log, log,
"Configured for testnet"; "Configured for network";
"name" => &testnet_name "name" => &testnet_name
); );
if testnet_name == "mainnet" {
warn!(
log,
"The mainnet specification is being used. This not recommended (yet)."
)
}
match matches.subcommand() { match matches.subcommand() {
("beacon_node", Some(matches)) => { ("beacon_node", Some(matches)) => {
let context = environment.core_context(); let context = environment.core_context();

4
lighthouse/tests/account_manager.rs
View File

@ -284,13 +284,9 @@ impl TestValidator {
let pubkeys = stdout[..stdout.len() - 1] let pubkeys = stdout[..stdout.len() - 1]
.split("\n") .split("\n")
.filter_map(|line| { .filter_map(|line| {
if line.starts_with(MAINNET_WARNING) {
None
} else {
let tab = line.find("\t").expect("line must have tab"); let tab = line.find("\t").expect("line must have tab");
let (_, pubkey) = line.split_at(tab + 1); let (_, pubkey) = line.split_at(tab + 1);
Some(pubkey.to_string()) Some(pubkey.to_string())
}
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();