gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-02 16:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

test fixes

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-05-10 22:07:46 -07:00
parent f5d801ce6b
commit 9438ed7add
2 changed files with 78 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
validator_client/http_api/src/tests.rs
View File

@@ -460,8 +460,8 @@ impl ApiTester {
} }
pub async fn create_web3signer_validators(self, s: Web3SignerValidatorScenario) -> Self { pub async fn create_web3signer_validators(self, s: Web3SignerValidatorScenario) -> Self {
let initial_vals = self.vals_total(); let initial_vals = self.vals_total().await;
let initial_enabled_vals = self.vals_enabled(); let initial_enabled_vals = self.vals_enabled().await;
let request: Vec<_> = (0..s.count) let request: Vec<_> = (0..s.count)
.map(|i| { .map(|i| {
@@ -995,7 +995,9 @@ async fn hd_validator_creation() {
ApiTester::new() ApiTester::new()
.await .await
.assert_enabled_validators_count(0) .assert_enabled_validators_count(0)
.await
.assert_validators_count(0) .assert_validators_count(0)
.await
.create_hd_validators(HdValidatorScenario { .create_hd_validators(HdValidatorScenario {
count: 2, count: 2,
specify_mnemonic: true, specify_mnemonic: true,
@@ -1004,7 +1006,9 @@ async fn hd_validator_creation() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.create_hd_validators(HdValidatorScenario { .create_hd_validators(HdValidatorScenario {
count: 1, count: 1,
specify_mnemonic: false, specify_mnemonic: false,
@@ -1013,7 +1017,9 @@ async fn hd_validator_creation() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(3) .assert_validators_count(3)
.await
.create_hd_validators(HdValidatorScenario { .create_hd_validators(HdValidatorScenario {
count: 0, count: 0,
specify_mnemonic: true, specify_mnemonic: true,
@@ -1022,7 +1028,9 @@ async fn hd_validator_creation() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.assert_validators_count(3); .await
.assert_validators_count(3)
.await;
} }
#[tokio::test] #[tokio::test]
@@ -1037,7 +1045,9 @@ async fn validator_exit() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.test_sign_voluntary_exits(0, None) .test_sign_voluntary_exits(0, None)
.await .await
.test_sign_voluntary_exits(0, Some(Epoch::new(256))) .test_sign_voluntary_exits(0, Some(Epoch::new(256)))
@@ -1056,15 +1066,21 @@ async fn validator_enabling() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_validator_enabled(0, false) .set_validator_enabled(0, false)
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_validator_enabled(0, true) .set_validator_enabled(0, true)
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.assert_validators_count(2); .await
.assert_validators_count(2)
.await;
} }
#[tokio::test] #[tokio::test]
@@ -1079,7 +1095,9 @@ async fn validator_gas_limit() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_gas_limit(0, 500) .set_gas_limit(0, 500)
.await .await
.assert_gas_limit(0, 500) .assert_gas_limit(0, 500)
@@ -1088,12 +1106,15 @@ async fn validator_gas_limit() {
.set_validator_enabled(0, false) .set_validator_enabled(0, false)
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_gas_limit(0, 1000) .set_gas_limit(0, 1000)
.await .await
.set_validator_enabled(0, true) .set_validator_enabled(0, true)
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_gas_limit(0, 1000) .assert_gas_limit(0, 1000)
.await; .await;
} }
@@ -1110,19 +1131,24 @@ async fn validator_builder_proposals() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_builder_proposals(0, true) .set_builder_proposals(0, true)
.await .await
// Test setting builder proposals while the validator is disabled // Test setting builder proposals while the validator is disabled
.set_validator_enabled(0, false) .set_validator_enabled(0, false)
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_builder_proposals(0, false) .set_builder_proposals(0, false)
.await .await
.set_validator_enabled(0, true) .set_validator_enabled(0, true)
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_builder_proposals(0, false) .assert_builder_proposals(0, false)
.await; .await;
} }
@@ -1139,19 +1165,24 @@ async fn validator_builder_boost_factor() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_builder_boost_factor(0, 120) .set_builder_boost_factor(0, 120)
.await .await
// Test setting builder proposals while the validator is disabled // Test setting builder proposals while the validator is disabled
.set_validator_enabled(0, false) .set_validator_enabled(0, false)
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_builder_boost_factor(0, 80) .set_builder_boost_factor(0, 80)
.await .await
.set_validator_enabled(0, true) .set_validator_enabled(0, true)
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_builder_boost_factor(0, Some(80)) .assert_builder_boost_factor(0, Some(80))
.await; .await;
} }
@@ -1176,6 +1207,7 @@ async fn validator_derived_builder_boost_factor_with_process_defaults() {
}) })
.await .await
.assert_default_builder_boost_factor(Some(80)) .assert_default_builder_boost_factor(Some(80))
.await
.assert_validator_derived_builder_boost_factor(0, Some(80)) .assert_validator_derived_builder_boost_factor(0, Some(80))
.await .await
.set_builder_proposals(0, false) .set_builder_proposals(0, false)
@@ -1202,7 +1234,8 @@ async fn validator_builder_boost_factor_global_builder_proposals_true() {
}; };
ApiTester::new_with_config(config) ApiTester::new_with_config(config)
.await .await
.assert_default_builder_boost_factor(None); .assert_default_builder_boost_factor(None)
.await;
} }
#[tokio::test] #[tokio::test]
@@ -1215,7 +1248,8 @@ async fn validator_builder_boost_factor_global_builder_proposals_false() {
}; };
ApiTester::new_with_config(config) ApiTester::new_with_config(config)
.await .await
.assert_default_builder_boost_factor(Some(0)); .assert_default_builder_boost_factor(Some(0))
.await;
} }
#[tokio::test] #[tokio::test]
@@ -1228,7 +1262,8 @@ async fn validator_builder_boost_factor_global_prefer_builder_proposals_true() {
}; };
ApiTester::new_with_config(config) ApiTester::new_with_config(config)
.await .await
.assert_default_builder_boost_factor(Some(u64::MAX)); .assert_default_builder_boost_factor(Some(u64::MAX))
.await;
} }
#[tokio::test] #[tokio::test]
@@ -1241,7 +1276,8 @@ async fn validator_builder_boost_factor_global_prefer_builder_proposals_true_ove
}; };
ApiTester::new_with_config(config) ApiTester::new_with_config(config)
.await .await
.assert_default_builder_boost_factor(Some(u64::MAX)); .assert_default_builder_boost_factor(Some(u64::MAX))
.await;
} }
#[tokio::test] #[tokio::test]
@@ -1256,19 +1292,24 @@ async fn prefer_builder_proposals_validator() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_prefer_builder_proposals(0, false) .set_prefer_builder_proposals(0, false)
.await .await
// Test setting builder proposals while the validator is disabled // Test setting builder proposals while the validator is disabled
.set_validator_enabled(0, false) .set_validator_enabled(0, false)
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_prefer_builder_proposals(0, true) .set_prefer_builder_proposals(0, true)
.await .await
.set_validator_enabled(0, true) .set_validator_enabled(0, true)
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_prefer_builder_proposals(0, true) .assert_prefer_builder_proposals(0, true)
.await; .await;
} }
@@ -1285,7 +1326,9 @@ async fn validator_graffiti() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_graffiti(0, "Mr F was here") .set_graffiti(0, "Mr F was here")
.await .await
.assert_graffiti(0, "Mr F was here") .assert_graffiti(0, "Mr F was here")
@@ -1294,12 +1337,15 @@ async fn validator_graffiti() {
.set_validator_enabled(0, false) .set_validator_enabled(0, false)
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_graffiti(0, "Mr F was here again") .set_graffiti(0, "Mr F was here again")
.await .await
.set_validator_enabled(0, true) .set_validator_enabled(0, true)
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_graffiti(0, "Mr F was here again") .assert_graffiti(0, "Mr F was here again")
.await; .await;
} }
@@ -1316,7 +1362,9 @@ async fn validator_graffiti_api() {
}) })
.await .await
.assert_enabled_validators_count(2) .assert_enabled_validators_count(2)
.await
.assert_validators_count(2) .assert_validators_count(2)
.await
.set_graffiti(0, "Mr F was here") .set_graffiti(0, "Mr F was here")
.await .await
.test_get_graffiti(0, "Mr F was here") .test_get_graffiti(0, "Mr F was here")
@@ -1334,28 +1382,36 @@ async fn keystore_validator_creation() {
ApiTester::new() ApiTester::new()
.await .await
.assert_enabled_validators_count(0) .assert_enabled_validators_count(0)
.await
.assert_validators_count(0) .assert_validators_count(0)
.await
.create_keystore_validators(KeystoreValidatorScenario { .create_keystore_validators(KeystoreValidatorScenario {
correct_password: true, correct_password: true,
enabled: true, enabled: true,
}) })
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(1) .assert_validators_count(1)
.await
.create_keystore_validators(KeystoreValidatorScenario { .create_keystore_validators(KeystoreValidatorScenario {
correct_password: false, correct_password: false,
enabled: true, enabled: true,
}) })
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.await
.assert_validators_count(1) .assert_validators_count(1)
.await
.create_keystore_validators(KeystoreValidatorScenario { .create_keystore_validators(KeystoreValidatorScenario {
correct_password: true, correct_password: true,
enabled: false, enabled: false,
}) })
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.assert_validators_count(2); .await
.assert_validators_count(2)
.await;
} }
#[tokio::test] #[tokio::test]
@@ -1363,12 +1419,16 @@ async fn web3signer_validator_creation() {
ApiTester::new() ApiTester::new()
.await .await
.assert_enabled_validators_count(0) .assert_enabled_validators_count(0)
.await
.assert_validators_count(0) .assert_validators_count(0)
.await
.create_web3signer_validators(Web3SignerValidatorScenario { .create_web3signer_validators(Web3SignerValidatorScenario {
count: 1, count: 1,
enabled: true, enabled: true,
}) })
.await .await
.assert_enabled_validators_count(1) .assert_enabled_validators_count(1)
.assert_validators_count(1); .await
.assert_validators_count(1)
.await;
} }

16
validator_client/http_api/src/tests/keystores.rs
View File

@@ -2092,8 +2092,8 @@ async fn import_remotekey_web3signer_disabled() {
.unwrap(); .unwrap();
// 1 validator imported. // 1 validator imported.
assert_eq!(tester.vals_total(), 1); assert_eq!(tester.vals_total().await, 1);
assert_eq!(tester.vals_enabled(), 0); assert_eq!(tester.vals_enabled().await, 0);
// Import remotekeys. // Import remotekeys.
let import_res = tester let import_res = tester
@@ -2109,8 +2109,8 @@ async fn import_remotekey_web3signer_disabled() {
); );
// Still only one validator. Web3signer is overwritten by remotekey. // Still only one validator. Web3signer is overwritten by remotekey.
assert_eq!(tester.vals_total(), 1); assert_eq!(tester.vals_total().await, 1);
assert_eq!(tester.vals_enabled(), 1); assert_eq!(tester.vals_enabled().await, 1);
// Remotekey overwrites web3signer. // Remotekey overwrites web3signer.
let expected_responses = vec![SingleListRemotekeysResponse { let expected_responses = vec![SingleListRemotekeysResponse {
@@ -2147,8 +2147,8 @@ async fn import_remotekey_web3signer_enabled() {
.unwrap(); .unwrap();
// 1 validator imported. // 1 validator imported.
assert_eq!(tester.vals_total(), 1); assert_eq!(tester.vals_total().await, 1);
assert_eq!(tester.vals_enabled(), 1); assert_eq!(tester.vals_enabled().await, 1);
let web3_vals = tester let web3_vals = tester
.initialized_validators .initialized_validators
.read() .read()
@@ -2169,8 +2169,8 @@ async fn import_remotekey_web3signer_enabled() {
all_with_status(1, ImportRemotekeyStatus::Duplicate), all_with_status(1, ImportRemotekeyStatus::Duplicate),
); );
assert_eq!(tester.vals_total(), 1); assert_eq!(tester.vals_total().await, 1);
assert_eq!(tester.vals_enabled(), 1); assert_eq!(tester.vals_enabled().await, 1);
{ {
let vals = tester.initialized_validators.read().await; let vals = tester.initialized_validators.read().await;
let remote_vals = vals.validator_definitions(); let remote_vals = vals.validator_definitions();