workflows: add insert_sdcard() to workflows

Author: benma

src/rust/bitbox02-rust/src/hww/api.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/backup.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();

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

@@ -18,9 +18,10 @@ use crate::pb::insert_remove_sd_card_request::SdCardAction;
 
 use pb::response::Response;
 
-use crate::workflow::sdcard;
+use crate::workflow::Workflows;
 
-pub async fn process(
+pub async fn process<W: Workflows>(
+    workflows: &mut W,
     &pb::InsertRemoveSdCardRequest { action }: &pb::InsertRemoveSdCardRequest,
 ) -> Result<Response, Error> {
     let inserted = bitbox02::sd::sdcard_inserted();
@@ -31,7 +32,7 @@ pub async fn process(
     if inserted {
         return Ok(Response::Success(pb::Success {}));
     }
-    sdcard::sdcard().await?;
+    workflows.insert_sdcard().await?;
     Ok(Response::Success(pb::Success {}))
 }
 
@@ -40,6 +41,7 @@ mod tests {
     use super::*;
 
     use crate::bb02_async::block_on;
+    use crate::workflow::testing::TestingWorkflows;
     use alloc::boxed::Box;
     use bitbox02::testing::{mock, Data};
 
@@ -51,9 +53,12 @@ mod tests {
             ..Default::default()
         });
         assert_eq!(
-            block_on(process(&pb::InsertRemoveSdCardRequest {
-                action: SdCardAction::InsertCard as _,
-            })),
+            block_on(process(
+                &mut TestingWorkflows::new(),
+                &pb::InsertRemoveSdCardRequest {
+                    action: SdCardAction::InsertCard as _,
+                }
+            )),
             Ok(Response::Success(pb::Success {}))
         );
 
@@ -63,9 +68,12 @@ mod tests {
             ..Default::default()
         });
         assert_eq!(
-            block_on(process(&pb::InsertRemoveSdCardRequest {
-                action: SdCardAction::RemoveCard as _,
-            })),
+            block_on(process(
+                &mut TestingWorkflows::new(),
+                &pb::InsertRemoveSdCardRequest {
+                    action: SdCardAction::RemoveCard as _,
+                }
+            )),
             Ok(Response::Success(pb::Success {}))
         );
 
@@ -75,9 +83,12 @@ mod tests {
             ..Default::default()
         });
         assert_eq!(
-            block_on(process(&pb::InsertRemoveSdCardRequest {
-                action: SdCardAction::InsertCard as _,
-            })),
+            block_on(process(
+                &mut TestingWorkflows::new(),
+                &pb::InsertRemoveSdCardRequest {
+                    action: SdCardAction::InsertCard as _,
+                }
+            )),
             Ok(Response::Success(pb::Success {}))
         );
 
@@ -87,9 +98,12 @@ mod tests {
             ..Default::default()
         });
         assert_eq!(
-            block_on(process(&pb::InsertRemoveSdCardRequest {
-                action: SdCardAction::RemoveCard as _,
-            })),
+            block_on(process(
+                &mut TestingWorkflows::new(),
+                &pb::InsertRemoveSdCardRequest {
+                    action: SdCardAction::RemoveCard as _,
+                }
+            )),
             Ok(Response::Success(pb::Success {}))
         );
     }

src/rust/bitbox02-rust/src/workflow.rs

@@ -56,6 +56,8 @@ pub trait Workflows {
         can_cancel: trinary_input_string::CanCancel,
         preset: &str,
     ) -> Result<zeroize::Zeroizing<String>, trinary_input_string::Error>;
+
+    async fn insert_sdcard(&mut self) -> Result<(), sdcard::UserAbort>;
 }
 
 pub struct RealWorkflows;
@@ -99,4 +101,9 @@ impl Workflows for RealWorkflows {
     ) -> Result<zeroize::Zeroizing<String>, trinary_input_string::Error> {
         trinary_input_string::enter(params, can_cancel, preset).await
     }
+
+    #[inline(always)]
+    async fn insert_sdcard(&mut self) -> Result<(), sdcard::UserAbort> {
+        sdcard::sdcard().await
+    }
 }

src/rust/bitbox02-rust/src/workflow/testing.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::{confirm, transaction, trinary_input_string, Workflows};
+use super::{confirm, sdcard, transaction, trinary_input_string, Workflows};
 
 use alloc::boxed::Box;
 use alloc::string::String;
@@ -133,6 +133,10 @@ impl Workflows for TestingWorkflows<'_> {
     ) -> Result<zeroize::Zeroizing<String>, trinary_input_string::Error> {
         self._enter_string.as_mut().unwrap()(params).map(zeroize::Zeroizing::new)
     }
+
+    async fn insert_sdcard(&mut self) -> Result<(), sdcard::UserAbort> {
+        Ok(())
+    }
 }
 
 impl<'a> TestingWorkflows<'a> {