Merge branch 'main' into fix/duplicate-client-messages

Author: ilbertt

.github/workflows/rust-tests.yml

@@ -24,7 +24,7 @@ jobs:
         run: cargo fmt -- --check
 
       - name: Cargo clippy
-        run: cargo clippy --all --all-features -- -Dwarnings
+        run: cargo clippy --all-targets --all-features --workspace -- -Dwarnings
 
       - name: Run unit tests
         run: ./scripts/unit_test.sh

src/gateway-state/src/lib.rs

@@ -399,7 +399,6 @@ mod tests {
 
         {
             let gateway_state = gateway_state.clone();
-            let canister_id = canister_id.clone();
             thread::spawn(move || loop {
                 gateway_state.remove_canister_if_empty(canister_id);
             });
@@ -461,7 +460,6 @@ mod tests {
 
         {
             let gateway_state = gateway_state.clone();
-            let canister_id = canister_id.clone();
             thread::spawn(move || {
                 for i in 0.. {
                     let client_key = ClientKey::new(Principal::anonymous(), i);
@@ -516,7 +514,6 @@ mod tests {
 
         {
             let gateway_state = gateway_state.clone();
-            let canister_id = canister_id.clone();
             thread::spawn(move || {
                 for i in 0.. {
                     let client_key = ClientKey::new(Principal::anonymous(), i);

src/ic-websocket-gateway/src/tests/canister_poller.rs

@@ -1,3 +1,10 @@
+// mockito::Server is behind a SYNC mutex so that only one test at the same time can access it
+// otherwise, as async tests are run on multiple threads, the mock response of one test might overwrite
+// the mock response of another, causing the test to fail
+// acquiring the mutex and the beginning of each test and dropping the guard only at the end,
+// ensures that only one test at the time can set the mock response
+// this enables running the tests without specifying each time "-- --test-threads=1"
+#[allow(clippy::await_holding_lock)]
 #[cfg(test)]
 mod test {
     use candid::Principal;
@@ -86,14 +93,12 @@ mod test {
     }
 
     lazy_static! {
-        // mockito::Server is behind a SYNC mutex so that only one test at the same time can access it
-        // otherwise, as async tests are run on multiple threads, the mock response of one test might overwrite
-        // the mock response of another, causing the test to fail
-        // acquiring the mutex and the beginning of each test and dropping the guard only at the end,
-        // ensures that only one test at the time can set the mock response
-        // this enables running the tests without specifying each time "-- --test-threads=1"
-        static ref MOCK_SERVER: Arc<Mutex<mockito::Server>> =
-            Arc::new(Mutex::new(mockito::Server::new_with_opts(mockito::ServerOpts { port: 51558, ..Default::default() })));
+        static ref MOCK_SERVER: Arc<Mutex<mockito::Server>> = Arc::new(Mutex::new(
+            mockito::Server::new_with_opts(mockito::ServerOpts {
+                port: 51558,
+                ..Default::default()
+            })
+        ));
     }
 
     fn create_poller(
@@ -332,7 +337,7 @@ mod test {
             .mock("GET", path)
             .with_chunked_body(|w| {
                 thread::sleep(Duration::from_millis(POLLING_TIMEOUT_MS + 10));
-                w.write_all(&vec![])
+                w.write_all(&[])
             })
             .expect(2)
             .create_async()