refactor(rust): refactor background auto-approving thread

Also, remove tracing from unit-tests and enable `test_ecdh_shared_secret`.

[no changelog]

Author: romanz

rust/trezor-client/src/lib.rs

@@ -169,10 +169,11 @@ mod tests {
         emulator
     }
 
-    /// Spawn a thread that continuously sends a "YES" decision to the debug link.
-    fn spawn_debug_yes_loop<'scope, 'env>(
-        scope: &'scope thread::Scope<'scope, 'env>,
-    ) -> Arc<AtomicBool> {
+    /// Spawn a background thread that continuously sends a "YES" decision to the debug link.
+    fn with_auto_approve<F, T>(f: F) -> T
+    where
+        F: FnOnce() -> T,
+    {
         let mut debuglink = find_devices(true)
             .into_iter()
             .find(|t| t.model == Model::TrezorEmulator)
@@ -186,17 +187,20 @@ mod tests {
         let mut req = DebugLinkDecision::new();
         req.set_button(DebugButton::YES);
 
-        scope.spawn(move || {
-            while !stop_clone.load(Ordering::Relaxed) {
-                // DebugLinkDecision has no response; send fire-and-forget then
-                // poll state so the firmware has time to process the decision.
-                let _ = debuglink.send_message(req.clone());
-                let _ = debuglink
-                    .call(DebugLinkGetState::new(), Box::new(|_, m: DebugLinkState| Ok(m)));
-            }
-        });
-
-        stop
+        thread::scope(|scope| {
+            scope.spawn(move || {
+                while !stop_clone.load(Ordering::Relaxed) {
+                    // DebugLinkDecision has no response; send fire-and-forget then poll
+                    // state (which returns when the firmware has processed the decision).
+                    let _ = debuglink.send_message(req.clone());
+                    let _ = debuglink
+                        .call(DebugLinkGetState::new(), Box::new(|_, m: DebugLinkState| Ok(m)));
+                }
+            });
+            let res = f();
+            stop.store(true, Ordering::Relaxed);
+            res
+        })
     }
 
     #[test]
@@ -233,12 +237,9 @@ mod tests {
         assert_eq!(address.ok().unwrap().to_string(), "mvbu1Gdy8SUjTenqerxUaZyYjmveZvt33q");
     }
 
-    #[ignore]
     #[test]
     #[serial]
     fn test_ecdh_shared_secret() {
-        tracing_subscriber::fmt().with_max_level(tracing::Level::TRACE).init();
-
         let mut emulator = init_emulator();
         assert_eq!(emulator.features().expect("Failed to get features").label(), "SLIP-0014");
 
@@ -252,11 +253,14 @@ mod tests {
 
         let peer_public_key = Vec::from_hex("0407f2c6e5becf3213c1d07df0cfbe8e39f70a8c643df7575e5c56859ec52c45ca950499c019719dae0fda04248d851e52cf9d66eeb211d89a77be40de22b6c89d").unwrap();
         let curve_name = "secp256k1".to_owned();
-        let response = handle_interaction(
-            emulator
-                .get_ecdh_session_key(ident, peer_public_key, curve_name)
-                .expect("Failed to get ECDH shared secret"),
-        )
+
+        let response = with_auto_approve(|| {
+            handle_interaction(
+                emulator
+                    .get_ecdh_session_key(ident, peer_public_key, curve_name)
+                    .expect("Failed to get ECDH shared secret"),
+            )
+        })
         .unwrap();
 
         let expected_session_key = Vec::from_hex("048125883b086746244b0d2c548860ecc723346e14c87e51dc7ba32791bc780d132dbd814fbee77134f318afac6ad6db3c5334efe6a8798628a1038195b96e82e2").unwrap();
@@ -271,32 +275,24 @@ mod tests {
     #[test]
     #[serial]
     fn test_ethereum_sign_tx_large() {
-        tracing_subscriber::fmt().with_max_level(tracing::Level::TRACE).init();
-
         let mut emulator = init_emulator();
         assert_eq!(emulator.features().expect("Failed to get features").label(), "SLIP-0014");
 
-        let signature = thread::scope(|s| {
-            let stop = spawn_debug_yes_loop(s);
-
-            let signature = emulator
-                .ethereum_sign_tx(
-                    // default ETH path
-                    vec![44 + (1 << 31), 60 + (1 << 31), 0 + (1 << 31), 0, 0],
-                    vec![],
-                    vec![],
-                    vec![],
-                    "".to_string(),
-                    vec![],
-                    // 10kB of empty data
-                    vec![0; 10 * 1024],
-                    Some(1u64),
-                )
-                .unwrap();
-
-            stop.store(true, Ordering::Relaxed);
-            signature
-        });
+        let signature = with_auto_approve(|| {
+            emulator.ethereum_sign_tx(
+                // default ETH path
+                vec![44 + (1 << 31), 60 + (1 << 31), 0 + (1 << 31), 0, 0],
+                vec![],
+                vec![],
+                vec![],
+                "".to_string(),
+                vec![],
+                // 10kB of empty data
+                vec![0; 10 * 1024],
+                Some(1u64),
+            )
+        })
+        .unwrap();
 
         assert_eq!(signature.r.len(), 32);
         assert_eq!(signature.s.len(), 32);