Skip to content

Commit b3a8bf1

Browse files
michaelsproulmichaelsproul
committed
Fix BN CLI tests for insecure genesis sync
1 parent 9e6919d commit b3a8bf1

File tree

1 file changed

+28
-7
lines changed

1 file changed

+28
-7
lines changed

‎lighthouse/tests/beacon_node.rs

+28-7
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ impl CommandLineTest {
5555
}
5656

5757
fn run_with_zero_port(&mut self) -> CompletedTest<Config> {
58+
// Required since Deneb was enabled on mainnet.
59+
self.cmd.arg("--allow-insecure-genesis-sync");
60+
self.run_with_zero_port_and_no_genesis_sync()
61+
}
62+
63+
fn run_with_zero_port_and_no_genesis_sync(&mut self) -> CompletedTest<Config> {
5864
self.cmd.arg("-z");
5965
self.run()
6066
}
@@ -93,16 +99,16 @@ fn staking_flag() {
9399
}
94100

95101
#[test]
96-
fn allow_insecure_genesis_sync() {
97-
CommandLineTest::new()
98-
.run_with_zero_port()
99-
.with_config(|config| {
100-
assert_eq!(config.allow_insecure_genesis_sync, false);
101-
});
102+
#[should_panic]
103+
fn allow_insecure_genesis_sync_default() {
104+
CommandLineTest::new().run_with_zero_port_and_no_genesis_sync();
105+
}
102106

107+
#[test]
108+
fn allow_insecure_genesis_sync_enabled() {
103109
CommandLineTest::new()
104110
.flag("allow-insecure-genesis-sync", None)
105-
.run_with_zero_port()
111+
.run_with_zero_port_and_no_genesis_sync()
106112
.with_config(|config| {
107113
assert_eq!(config.allow_insecure_genesis_sync, true);
108114
});
@@ -851,6 +857,7 @@ fn network_port_flag_over_ipv4() {
851857
let port = 0;
852858
CommandLineTest::new()
853859
.flag("port", Some(port.to_string().as_str()))
860+
.flag("allow-insecure-genesis-sync", None)
854861
.run()
855862
.with_config(|config| {
856863
assert_eq!(
@@ -867,6 +874,7 @@ fn network_port_flag_over_ipv4() {
867874
let port = 9000;
868875
CommandLineTest::new()
869876
.flag("port", Some(port.to_string().as_str()))
877+
.flag("allow-insecure-genesis-sync", None)
870878
.run()
871879
.with_config(|config| {
872880
assert_eq!(
@@ -886,6 +894,7 @@ fn network_port_flag_over_ipv6() {
886894
CommandLineTest::new()
887895
.flag("listen-address", Some("::1"))
888896
.flag("port", Some(port.to_string().as_str()))
897+
.flag("allow-insecure-genesis-sync", None)
889898
.run()
890899
.with_config(|config| {
891900
assert_eq!(
@@ -903,6 +912,7 @@ fn network_port_flag_over_ipv6() {
903912
CommandLineTest::new()
904913
.flag("listen-address", Some("::1"))
905914
.flag("port", Some(port.to_string().as_str()))
915+
.flag("allow-insecure-genesis-sync", None)
906916
.run()
907917
.with_config(|config| {
908918
assert_eq!(
@@ -925,6 +935,7 @@ fn network_port_flag_over_ipv4_and_ipv6() {
925935
.flag("listen-address", Some("::1"))
926936
.flag("port", Some(port.to_string().as_str()))
927937
.flag("port6", Some(port6.to_string().as_str()))
938+
.flag("allow-insecure-genesis-sync", None)
928939
.run()
929940
.with_config(|config| {
930941
assert_eq!(
@@ -954,6 +965,7 @@ fn network_port_flag_over_ipv4_and_ipv6() {
954965
.flag("listen-address", Some("::1"))
955966
.flag("port", Some(port.to_string().as_str()))
956967
.flag("port6", Some(port6.to_string().as_str()))
968+
.flag("allow-insecure-genesis-sync", None)
957969
.run()
958970
.with_config(|config| {
959971
assert_eq!(
@@ -983,6 +995,7 @@ fn network_port_and_discovery_port_flags_over_ipv4() {
983995
CommandLineTest::new()
984996
.flag("port", Some(tcp4_port.to_string().as_str()))
985997
.flag("discovery-port", Some(disc4_port.to_string().as_str()))
998+
.flag("allow-insecure-genesis-sync", None)
986999
.run()
9871000
.with_config(|config| {
9881001
assert_eq!(
@@ -1003,6 +1016,7 @@ fn network_port_and_discovery_port_flags_over_ipv6() {
10031016
.flag("listen-address", Some("::1"))
10041017
.flag("port", Some(tcp6_port.to_string().as_str()))
10051018
.flag("discovery-port", Some(disc6_port.to_string().as_str()))
1019+
.flag("allow-insecure-genesis-sync", None)
10061020
.run()
10071021
.with_config(|config| {
10081022
assert_eq!(
@@ -1028,6 +1042,7 @@ fn network_port_and_discovery_port_flags_over_ipv4_and_ipv6() {
10281042
.flag("discovery-port", Some(disc4_port.to_string().as_str()))
10291043
.flag("port6", Some(tcp6_port.to_string().as_str()))
10301044
.flag("discovery-port6", Some(disc6_port.to_string().as_str()))
1045+
.flag("allow-insecure-genesis-sync", None)
10311046
.run()
10321047
.with_config(|config| {
10331048
assert_eq!(
@@ -1067,6 +1082,7 @@ fn network_port_discovery_quic_port_flags_over_ipv4_and_ipv6() {
10671082
.flag("port6", Some(tcp6_port.to_string().as_str()))
10681083
.flag("discovery-port6", Some(disc6_port.to_string().as_str()))
10691084
.flag("quic-port6", Some(quic6_port.to_string().as_str()))
1085+
.flag("allow-insecure-genesis-sync", None)
10701086
.run()
10711087
.with_config(|config| {
10721088
assert_eq!(
@@ -1293,6 +1309,7 @@ fn enr_match_flag_over_ipv4() {
12931309
.flag("listen-address", Some("127.0.0.2"))
12941310
.flag("discovery-port", Some(udp4_port.to_string().as_str()))
12951311
.flag("port", Some(tcp4_port.to_string().as_str()))
1312+
.flag("allow-insecure-genesis-sync", None)
12961313
.run()
12971314
.with_config(|config| {
12981315
assert_eq!(
@@ -1324,6 +1341,7 @@ fn enr_match_flag_over_ipv6() {
13241341
.flag("listen-address", Some(ADDR))
13251342
.flag("discovery-port", Some(udp6_port.to_string().as_str()))
13261343
.flag("port", Some(tcp6_port.to_string().as_str()))
1344+
.flag("allow-insecure-genesis-sync", None)
13271345
.run()
13281346
.with_config(|config| {
13291347
assert_eq!(
@@ -1364,6 +1382,7 @@ fn enr_match_flag_over_ipv4_and_ipv6() {
13641382
.flag("listen-address", Some(IPV6_ADDR))
13651383
.flag("discovery-port6", Some(udp6_port.to_string().as_str()))
13661384
.flag("port6", Some(tcp6_port.to_string().as_str()))
1385+
.flag("allow-insecure-genesis-sync", None)
13671386
.run()
13681387
.with_config(|config| {
13691388
assert_eq!(
@@ -1490,6 +1509,7 @@ fn http_port_flag() {
14901509
.flag("http", None)
14911510
.flag("http-port", Some(port1.to_string().as_str()))
14921511
.flag("port", Some(port2.to_string().as_str()))
1512+
.flag("allow-insecure-genesis-sync", None)
14931513
.run()
14941514
.with_config(|config| assert_eq!(config.http_api.listen_port, port1));
14951515
}
@@ -1647,6 +1667,7 @@ fn metrics_port_flag() {
16471667
.flag("metrics", None)
16481668
.flag("metrics-port", Some(port1.to_string().as_str()))
16491669
.flag("port", Some(port2.to_string().as_str()))
1670+
.flag("allow-insecure-genesis-sync", None)
16501671
.run()
16511672
.with_config(|config| assert_eq!(config.http_metrics.listen_port, port1));
16521673
}

0 commit comments

Comments
 (0)