From e6863c188cb9d0bd4009a1157206b7db6b45142c Mon Sep 17 00:00:00 2001 From: Mark Mackey Date: Tue, 22 Feb 2022 12:49:31 -0600 Subject: [PATCH] Addressed Sean's Comments --- lighthouse/tests/beacon_node.rs | 17 +++++++++++++++++ lighthouse/tests/exec.rs | 8 ++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lighthouse/tests/beacon_node.rs b/lighthouse/tests/beacon_node.rs index 2facd6d860..c5e99b3951 100644 --- a/lighthouse/tests/beacon_node.rs +++ b/lighthouse/tests/beacon_node.rs @@ -283,6 +283,23 @@ fn terminal_block_hash_and_activation_epoch_override_flags() { }); } #[test] +#[should_panic] +fn terminal_block_hash_missing_activation_epoch() { + CommandLineTest::new() + .flag( + "terminal-block-hash-override", + Some("0x4242424242424242424242424242424242424242424242424242424242424242"), + ) + .run_with_zero_port(); +} +#[test] +#[should_panic] +fn epoch_override_missing_terminal_block_hash() { + CommandLineTest::new() + .flag("terminal-block-hash-epoch-override", Some("1337")) + .run_with_zero_port(); +} +#[test] fn safe_slots_to_import_optimistically_flag() { CommandLineTest::new() .flag("safe-slots-to-import-optimistically", Some("421337")) diff --git a/lighthouse/tests/exec.rs b/lighthouse/tests/exec.rs index 8ddd622496..decdb827b6 100644 --- a/lighthouse/tests/exec.rs +++ b/lighthouse/tests/exec.rs @@ -36,9 +36,9 @@ pub trait CommandLineTestExec { let cmd = self.cmd_mut(); cmd.arg("--datadir") .arg(tmp_dir.path().as_os_str()) - .arg(format!("--{}", "--dump-config")) + .arg(format!("--{}", "dump-config")) .arg(tmp_config_path.as_os_str()) - .arg(format!("--{}", "--dump-chain-config")) + .arg(format!("--{}", "dump-chain-config")) .arg(tmp_chain_config_path.as_os_str()) .arg("--immediate-shutdown"); @@ -72,9 +72,9 @@ pub trait CommandLineTestExec { // Add args --datadir --dump-config --dump-chain-config --immediate-shutdown let cmd = self.cmd_mut(); - cmd.arg(format!("--{}", "--dump-config")) + cmd.arg(format!("--{}", "dump-config")) .arg(tmp_config_path.as_os_str()) - .arg(format!("--{}", "--dump-chain-config")) + .arg(format!("--{}", "dump-chain-config")) .arg(tmp_chain_config_path.as_os_str()) .arg("--immediate-shutdown");