fix await_holding_locks

Author: dknopik

beacon_node/http_api/tests/tests.rs

@@ -3508,6 +3508,7 @@ impl ApiTester {
         self
     }
 
+    #[allow(clippy::await_holding_lock)]  // This is a test, so it should be fine.
     pub async fn test_get_validator_aggregate_attestation(self) -> Self {
         if self
             .chain

testing/web3signer_tests/src/lib.rs

@@ -175,11 +175,8 @@ mod tests {
                     // Read a Github API token from the environment. This is intended to prevent rate-limits on CI.
                     // We use a name that is unlikely to accidentally collide with anything the user has configured.
                     let github_token = env::var("LIGHTHOUSE_GITHUB_TOKEN");
-                    download_binary(
-                        TEMP_DIR.lock().path().to_path_buf(),
-                        github_token.as_deref().unwrap_or(""),
-                    )
-                    .await;
+                    let dest_dir = TEMP_DIR.lock().path().to_path_buf();
+                    download_binary(dest_dir, github_token.as_deref().unwrap_or("")).await;
                 })
                 .await;
 

validator_client/http_api/src/tests/keystores.rs

@@ -2147,8 +2147,11 @@ async fn import_remotekey_web3signer_enabled() {
         // 1 validator imported.
         assert_eq!(tester.vals_total(), 1);
         assert_eq!(tester.vals_enabled(), 1);
-        let vals = tester.initialized_validators.read();
-        let web3_vals = vals.validator_definitions();
+        let web3_vals = tester
+            .initialized_validators
+            .read()
+            .validator_definitions()
+            .to_vec();
 
         // Import remotekeys.
         let import_res = tester
@@ -2165,11 +2168,13 @@ async fn import_remotekey_web3signer_enabled() {
 
         assert_eq!(tester.vals_total(), 1);
         assert_eq!(tester.vals_enabled(), 1);
-        let vals = tester.initialized_validators.read();
-        let remote_vals = vals.validator_definitions();
+        {
+            let vals = tester.initialized_validators.read();
+            let remote_vals = vals.validator_definitions();
 
-        // Web3signer should not be overwritten since it is enabled.
-        assert!(web3_vals == remote_vals);
+            // Web3signer should not be overwritten since it is enabled.
+            assert!(web3_vals == remote_vals);
+        }
 
         // Remotekey should not be imported.
         let expected_responses = vec![SingleListRemotekeysResponse {