rust: don't mock C btc_address_simple

Since a while we can call C code directly also in unit tests.

Author: benma

src/rust/bitbox02-rust/src/hww/api/bitcoin/signmsg.rs

@@ -135,9 +135,9 @@ mod tests {
     use std::boxed::Box;
     use util::bip32::HARDENED;
 
-    const ADDRESS: &str = "<address>";
     const KEYPATH: &[u32] = &[84 + HARDENED, 0 + HARDENED, 0 + HARDENED, 0, 0];
     const MESSAGE: &[u8] = b"message";
+    const EXPECTED_ADDRESS: &str = "bc1qk5f9em9qc8yfpks8ngfg3h8h02n2e3yeqdyhpt";
     const EXPECTED_SIGNATURE: &[u8] = b"\x0f\x1d\x54\x2a\x9e\x2f\x37\x4e\xfe\xd4\x57\x8c\xaa\x84\x72\xd1\xc3\x12\x68\xfb\x89\x2d\x39\xa6\x15\x44\x59\x18\x5b\x2d\x35\x4d\x3b\x2b\xff\xf0\xe1\x61\x5c\x77\x25\x73\x4f\x43\x13\x4a\xb4\x51\x6b\x7e\x7c\xb3\x9d\x2d\xba\xaa\x5f\x4e\x8b\x8a\xff\x9f\x97\xd0\x00";
 
     #[test]
@@ -159,10 +159,6 @@ mod tests {
         static mut CONFIRM_COUNTER: u32 = 0;
 
         mock(Data {
-            btc_address_simple: Some(Box::new(|coin, _, _| {
-                assert_eq!(coin, BtcCoin::Btc as _);
-                Ok(ADDRESS.into())
-            })),
             ui_confirm_create: Some(Box::new(|params| {
                 match unsafe {
                     CONFIRM_COUNTER += 1;
@@ -175,7 +171,7 @@ mod tests {
                     }
                     2 => {
                         assert_eq!(params.title, "Address");
-                        assert_eq!(params.body, ADDRESS);
+                        assert_eq!(params.body, EXPECTED_ADDRESS);
                         true
                     }
                     3 => {
@@ -217,7 +213,6 @@ mod tests {
 
         // Basic info dialog aborted.
         mock(Data {
-            btc_address_simple: Some(Box::new(|_, _, _| Ok(ADDRESS.into()))),
             ui_confirm_create: Some(Box::new(|params| {
                 match unsafe {
                     CONFIRM_COUNTER += 1;
@@ -233,14 +228,14 @@ mod tests {
             })),
             ..Default::default()
         });
+        mock_unlocked();
         assert_eq!(block_on(process(&request)), Err(Error::UserAbort));
 
         // Address verification aborted.
         unsafe {
             CONFIRM_COUNTER = 0;
         }
         mock(Data {
-            btc_address_simple: Some(Box::new(|_, _, _| Ok(ADDRESS.into()))),
             ui_confirm_create: Some(Box::new(|params| {
                 match unsafe {
                     CONFIRM_COUNTER += 1;
@@ -249,22 +244,22 @@ mod tests {
                     1 => true,
                     2 => {
                         assert_eq!(params.title, "Address");
-                        assert_eq!(params.body, ADDRESS);
+                        assert_eq!(params.body, EXPECTED_ADDRESS);
                         false
                     }
                     _ => panic!("too many user confirmations"),
                 }
             })),
             ..Default::default()
         });
+        mock_unlocked();
         assert_eq!(block_on(process(&request)), Err(Error::UserAbort));
 
         // Message verification aborted.
         unsafe {
             CONFIRM_COUNTER = 0;
         }
         mock(Data {
-            btc_address_simple: Some(Box::new(|_, _, _| Ok(ADDRESS.into()))),
             ui_confirm_create: Some(Box::new(|params| {
                 match unsafe {
                     CONFIRM_COUNTER += 1;
@@ -281,6 +276,7 @@ mod tests {
             })),
             ..Default::default()
         });
+        mock_unlocked();
         assert_eq!(block_on(process(&request)), Err(Error::UserAbort));
     }
 
@@ -354,19 +350,19 @@ mod tests {
             Err(Error::InvalidInput)
         );
 
-        // Address could not be generated
+        // Invalid keypath
         mock(Data {
-            btc_address_simple: Some(Box::new(|_, _, _| Err(()))),
             ..Default::default()
         });
+        mock_unlocked();
         assert_eq!(
             block_on(process(&pb::BtcSignMessageRequest {
                 coin: BtcCoin::Btc as _,
                 script_config: Some(pb::BtcScriptConfigWithKeypath {
                     script_config: Some(pb::BtcScriptConfig {
                         config: Some(Config::SimpleType(SimpleType::P2wpkh as _))
                     }),
-                    keypath: KEYPATH.to_vec(),
+                    keypath: [0].to_vec(),
                 }),
                 msg: MESSAGE.to_vec(),
                 host_nonce_commitment: None,

src/rust/bitbox02/src/app_btc.rs

@@ -17,7 +17,6 @@ use alloc::string::String;
 
 pub use bitbox02_sys::{BTCCoin, BTCScriptConfig_SimpleType};
 
-#[cfg(not(feature = "testing"))]
 pub fn address_simple(
     coin: BTCCoin,
     script_type: BTCScriptConfig_SimpleType,
@@ -40,13 +39,3 @@ pub fn address_simple(
         false => Err(()),
     }
 }
-
-#[cfg(feature = "testing")]
-pub fn address_simple(
-    coin: BTCCoin,
-    script_type: BTCScriptConfig_SimpleType,
-    keypath: &[u32],
-) -> Result<String, ()> {
-    let data = crate::testing::DATA.0.borrow();
-    data.btc_address_simple.as_ref().unwrap()(coin, script_type, keypath)
-}

src/rust/bitbox02/src/testing.rs

@@ -38,15 +38,6 @@ pub struct Data {
     pub backup_create: Option<Box<dyn Fn(u32, u32) -> Result<(), super::backup::Error>>>,
     pub keystore_encode_xpub_at_keypath:
         Option<Box<dyn Fn(&[u32], super::keystore::xpub_type_t) -> Result<String, ()>>>,
-    pub btc_address_simple: Option<
-        Box<
-            dyn Fn(
-                bitbox02_sys::BTCCoin,
-                bitbox02_sys::BTCScriptConfig_SimpleType,
-                &[u32],
-            ) -> Result<String, ()>,
-        >,
-    >,
     pub ui_transaction_address_create: Option<Box<dyn Fn(&str, &str) -> bool>>,
     pub ui_transaction_fee_create: Option<Box<dyn Fn(&str, &str) -> bool>>,
 }