Merge remote-tracking branch 'labs/dev' into live_test_grpc

zingolabs · Jan 8, 2024 · 923b992 · 923b992
2 parents ed427e7 + 0d73cd3
commit 923b992
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/darkside-tests/tests/network_interruption_tests.rs b/darkside-tests/tests/network_interruption_tests.rs
@@ -76,11 +76,8 @@ async fn network_interrupt_test() {
     conditional_logic.insert(
         "get_tree_state",
         Box::new(|online: &Arc<AtomicBool>| {
-            {
-                println!("Turning off, as we received get_tree_state call");
-                online.store(false, Ordering::Relaxed);
-            }
-            .into()
+            println!("Turning off, as we received get_tree_state call");
+            online.store(false, Ordering::Relaxed);
         }),
     );
 

diff --git a/zingo-testutils/src/grpc_proxy.rs b/zingo-testutils/src/grpc_proxy.rs
@@ -62,6 +62,7 @@ macro_rules! define_grpc_passthrough {
 pub struct ProxyServer {
     pub lightwalletd_uri: http::Uri,
     pub online: Arc<AtomicBool>,
+    #[allow(clippy::type_complexity)]
     pub conditional_operations: HashMap<&'static str, Box<dyn Fn(&Arc<AtomicBool>) + Send + Sync>>,
 }
 

diff --git a/zingo-testutils/src/lib.rs b/zingo-testutils/src/lib.rs
@@ -1094,6 +1094,7 @@ pub mod scenarios {
     }
 }
 
+#[allow(clippy::type_complexity)]
 pub fn start_proxy_and_connect_lightclient(
     client: &LightClient,
     conditional_operations: HashMap<&'static str, Box<dyn Fn(&Arc<AtomicBool>) + Send + Sync>>,