Merge branch 'ui-ada'

Author: benma

src/rust/bitbox02-rust/src/hww.rs

@@ -172,7 +172,7 @@ async fn process_api<W: Workflows>(
         Request::SetMnemonicPassphraseEnabled(ref request) => {
             set_mnemonic_passphrase_enabled::process(workflows, request).await
         }
-        Request::InsertRemoveSdcard(ref request) => sdcard::process(request).await,
+        Request::InsertRemoveSdcard(ref request) => sdcard::process(workflows, request).await,
         Request::ListBackups(_) => backup::list(),
         Request::CheckSdcard(_) => Ok(Response::CheckSdcard(pb::CheckSdCardResponse {
             inserted: bitbox02::sd::sdcard_inserted(),

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

@@ -89,9 +89,12 @@ pub async fn create<W: Workflows>(
         .await?;
 
     // Wait for sd card
-    super::sdcard::process(&pb::InsertRemoveSdCardRequest {
-        action: pb::insert_remove_sd_card_request::SdCardAction::InsertCard as _,
-    })
+    super::sdcard::process(
+        workflows,
+        &pb::InsertRemoveSdCardRequest {
+            action: pb::insert_remove_sd_card_request::SdCardAction::InsertCard as _,
+        },
+    )
     .await?;
 
     let is_initialized = bitbox02::memory::is_initialized();
@@ -173,7 +176,6 @@ mod tests {
         // All good.
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         mock_sd();
         mock_memory();
@@ -225,7 +227,6 @@ mod tests {
             "577782fdfffbe314b23acaeefc39ad5e8641fba7e7dbe418a35956a879a67dd2";
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         mock_sd();
         mock_memory();
@@ -297,7 +298,6 @@ mod tests {
         // Create one backup.
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         mock_memory();
         mock_unlocked_using_mnemonic("purity concert above invest pigeon category peace tuition hazard vivid latin since legal speak nation session onion library travel spell region blast estate stay", "");
@@ -326,7 +326,6 @@ mod tests {
         // Create another backup.
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         mock_memory();
         mock_unlocked_using_mnemonic("goddess item rack improve shaft occur actress rib emerge salad rich blame model glare lounge stable electric height scrub scrub oyster now dinner oven", "");

src/rust/bitbox02-rust/src/hww/api/backup.rs

@@ -46,8 +46,8 @@ pub async fn process<W: Workflows>(
 /// Derives and displays a BIP-39 seed according to BIP-85:
 /// https://github.com/bitcoin/bips/blob/master/bip-0085.mediawiki#bip39.
 async fn process_bip39<W: Workflows>(workflows: &mut W) -> Result<(), Error> {
-    use crate::workflow::trinary_choice::{choose, TrinaryChoice};
-    use crate::workflow::{menu, mnemonic, trinary_input_string};
+    use crate::workflow::trinary_choice::TrinaryChoice;
+    use crate::workflow::{mnemonic, trinary_input_string};
 
     workflows
         .confirm(&confirm::Params {
@@ -68,7 +68,10 @@ async fn process_bip39<W: Workflows>(workflows: &mut W) -> Result<(), Error> {
         })
         .await?;
 
-    let num_words: u32 = match choose("How many words?", "12", "18", "24").await {
+    let num_words: u32 = match workflows
+        .trinary_choice("How many words?", "12", "18", "24")
+        .await
+    {
         TrinaryChoice::TRINARY_CHOICE_LEFT => 12,
         TrinaryChoice::TRINARY_CHOICE_MIDDLE => 18,
         TrinaryChoice::TRINARY_CHOICE_RIGHT => 24,
@@ -79,32 +82,34 @@ async fn process_bip39<W: Workflows>(workflows: &mut W) -> Result<(), Error> {
         .await;
 
     // Pick index. The first few are quick-access. "More" leads to a full number input keyboard.
-    let index: u32 =
-        match menu::pick(&["0", "1", "2", "3", "4", "More"], Some("Select index")).await? {
-            i @ 0..=4 => i.into(),
-            5 => {
-                let number_string = workflows
-                    .enter_string(
-                        &trinary_input_string::Params {
-                            title: "Enter index",
-                            number_input: true,
-                            longtouch: true,
-                            ..Default::default()
-                        },
-                        trinary_input_string::CanCancel::Yes,
-                        "",
-                    )
-                    .await?;
-                match number_string.as_str().parse::<u32>() {
-                    Ok(i) if i < util::bip32::HARDENED => i,
-                    _ => {
-                        workflows.status("Invalid index", false).await;
-                        return Err(Error::InvalidInput);
-                    }
+    let index: u32 = match workflows
+        .menu(&["0", "1", "2", "3", "4", "More"], Some("Select index"))
+        .await?
+    {
+        i @ 0..=4 => i.into(),
+        5 => {
+            let number_string = workflows
+                .enter_string(
+                    &trinary_input_string::Params {
+                        title: "Enter index",
+                        number_input: true,
+                        longtouch: true,
+                        ..Default::default()
+                    },
+                    trinary_input_string::CanCancel::Yes,
+                    "",
+                )
+                .await?;
+            match number_string.as_str().parse::<u32>() {
+                Ok(i) if i < util::bip32::HARDENED => i,
+                _ => {
+                    workflows.status("Invalid index", false).await;
+                    return Err(Error::InvalidInput);
                 }
             }
-            6.. => panic!("bip85 error"),
-        };
+        }
+        6.. => panic!("bip85 error"),
+    };
 
     workflows.status(&format!("Index: {}", index), true).await;
 

src/rust/bitbox02-rust/src/hww/api/bip85.rs

@@ -400,7 +400,7 @@ pub async fn process<W: Workflows>(
 mod tests {
     use super::*;
     use crate::bb02_async::block_on;
-    use crate::workflow::RealWorkflows;
+    use crate::workflow::testing::{Screen, TestingWorkflows};
     use alloc::boxed::Box;
     use bitbox02::testing::{mock, mock_unlocked, Data};
     use util::bip32::HARDENED;
@@ -476,7 +476,7 @@ mod tests {
 
     fn do_pkh_skh(keypath_payment: &[u32], keypath_stake: &[u32]) -> Result<Response, Error> {
         block_on(process(
-            &mut RealWorkflows,
+            &mut TestingWorkflows::new(),
             &pb::CardanoAddressRequest {
                 network: CardanoNetwork::CardanoMainnet as _,
                 display: false,
@@ -565,19 +565,11 @@ mod tests {
     fn test_process_confirm() {
         const EXPECTED: &str = "addr1q90tlskd4mh5kncmul7vx887j30tjtfgvap5n0g0rf9qqc7znmndrdhe7rwvqkw5c7mqnp4a3yflnvu6kff7l5dungvqmvu6hs";
 
-        mock(Data {
-            ui_confirm_create: Some(Box::new(|params| {
-                assert_eq!(params.title, "Cardano");
-                assert_eq!(params.body, EXPECTED);
-                true
-            })),
-            ..Default::default()
-        });
         mock_unlocked();
-
+        let mut mock_workflows = TestingWorkflows::new();
         assert_eq!(
             block_on(process(
-                &mut RealWorkflows,
+                &mut mock_workflows,
                 &pb::CardanoAddressRequest {
                     network: CardanoNetwork::CardanoMainnet as _,
                     display: true,
@@ -591,6 +583,14 @@ mod tests {
                 r#pub: EXPECTED.into()
             }))
         );
+        assert_eq!(
+            mock_workflows.screens,
+            vec![Screen::Confirm {
+                title: "Cardano".into(),
+                body: EXPECTED.into(),
+                longtouch: false,
+            },]
+        );
     }
 
     #[test]