rust/testing: remove unused old-school workflow mock callbacks

Now using the Workflows trait instead to mock locally, not globally.

Author: benma

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

@@ -364,7 +364,6 @@ mod tests {
 
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         let mut mock_workflows = TestingWorkflows::new();
         mock_workflows.set_enter_string(Box::new(|_params| Ok("password".into())));
@@ -483,7 +482,6 @@ mod tests {
             let mut make_request = init_noise();
             mock(Data {
                 sdcard_inserted: Some(true),
-                ..Default::default()
             });
 
             let mut mock_workflows = TestingWorkflows::new();

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

@@ -176,7 +176,6 @@ mod tests {
         // All good.
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         mock_sd();
         mock_memory();
@@ -228,7 +227,6 @@ mod tests {
             "577782fdfffbe314b23acaeefc39ad5e8641fba7e7dbe418a35956a879a67dd2";
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         mock_sd();
         mock_memory();
@@ -300,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", "");
@@ -329,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/sdcard.rs

@@ -50,7 +50,6 @@ mod tests {
         // already inserted.
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         assert_eq!(
             block_on(process(
@@ -65,7 +64,6 @@ mod tests {
         // already removed.
         mock(Data {
             sdcard_inserted: Some(false),
-            ..Default::default()
         });
         assert_eq!(
             block_on(process(
@@ -80,7 +78,6 @@ mod tests {
         // insert
         mock(Data {
             sdcard_inserted: Some(false),
-            ..Default::default()
         });
         assert_eq!(
             block_on(process(
@@ -95,7 +92,6 @@ mod tests {
         // remove
         mock(Data {
             sdcard_inserted: Some(true),
-            ..Default::default()
         });
         assert_eq!(
             block_on(process(

src/rust/bitbox02/src/testing.rs

@@ -15,20 +15,13 @@
 //! Small mocking infrastructure for testing.
 
 extern crate alloc;
-use alloc::boxed::Box;
-use alloc::string::String;
 use core::cell::RefCell;
 
 use crate::keystore;
 
 #[derive(Default)]
 pub struct Data {
-    pub ui_confirm_create: Option<Box<dyn Fn(&super::ui::ConfirmParams) -> bool>>,
     pub sdcard_inserted: Option<bool>,
-    pub ui_transaction_address_create: Option<Box<dyn Fn(&str, &str) -> bool>>,
-    pub ui_transaction_fee_create: Option<Box<dyn Fn(&str, &str, bool) -> bool>>,
-    pub ui_trinary_input_string_create:
-        Option<Box<dyn Fn(&super::ui::TrinaryInputStringParams) -> String>>,
 }
 
 pub struct SafeData(pub RefCell<Data>);
@@ -37,11 +30,7 @@ pub struct SafeData(pub RefCell<Data>);
 unsafe impl Sync for SafeData {}
 
 pub static DATA: SafeData = SafeData(RefCell::new(Data {
-    ui_confirm_create: None,
     sdcard_inserted: None,
-    ui_transaction_address_create: None,
-    ui_transaction_fee_create: None,
-    ui_trinary_input_string_create: None,
 }));
 
 /// Provide mock implementations and data. This also locks the keystore - use `mock_unlocked()` to mock a seeded and unlocked keystore.

src/rust/bitbox02/src/ui/ui_stub.rs

@@ -13,6 +13,9 @@
 // limitations under the License.
 
 //! Stubs for testing.
+//!
+//! NOTE: This is on the way out - we use the Workflows trait and TestingWorkflow to unit test
+//! workflows now.
 
 pub use super::types::{
     AcceptRejectCb, ConfirmParams, ContinueCancelCb, Font, MenuParams, SelectWordCb, TrinaryChoice,
@@ -48,61 +51,41 @@ impl Drop for Component<'_> {
 }
 
 pub fn trinary_input_string_create<'a, F>(
-    params: &TrinaryInputStringParams,
-    mut confirm_callback: F,
+    _params: &TrinaryInputStringParams,
+    _confirm_callback: F,
     _cancel_callback: Option<ContinueCancelCb<'a>>,
 ) -> Component<'a>
 where
     F: FnMut(zeroize::Zeroizing<String>) + 'a,
 {
-    let data = crate::testing::DATA.0.borrow();
-    let input_string = data.ui_trinary_input_string_create.as_ref().unwrap()(params);
-    confirm_callback(zeroize::Zeroizing::new(input_string));
-    Component {
-        is_pushed: false,
-        _p: PhantomData,
-    }
+    panic!("not used");
 }
 
-pub fn confirm_create<'a, F>(params: &ConfirmParams, mut result_callback: F) -> Component<'a>
+pub fn confirm_create<'a, F>(_params: &ConfirmParams, _result_callback: F) -> Component<'a>
 where
     F: FnMut(bool) + 'a,
 {
-    let data = crate::testing::DATA.0.borrow();
-    let result = data.ui_confirm_create.as_ref().unwrap()(params);
-    result_callback(result);
-    Component {
-        is_pushed: false,
-        _p: PhantomData,
-    }
+    panic!("not used");
 }
 
 pub fn screen_process() {}
 
-pub fn status_create<'a, F>(_text: &str, _status_success: bool, mut callback: F) -> Component<'a>
+pub fn status_create<'a, F>(_text: &str, _status_success: bool, _callback: F) -> Component<'a>
 where
     F: FnMut() + 'a,
 {
-    callback();
-    Component {
-        is_pushed: false,
-        _p: PhantomData,
-    }
+    panic!("not used");
 }
 
-pub fn sdcard_create<'a, F>(mut callback: F) -> Component<'a>
+pub fn sdcard_create<'a, F>(_callback: F) -> Component<'a>
 where
     F: FnMut(bool) + 'a,
 {
-    callback(true);
-    Component {
-        is_pushed: false,
-        _p: PhantomData,
-    }
+    panic!("not used");
 }
 
 pub fn menu_create(_params: MenuParams<'_>) -> Component<'_> {
-    panic!("not implemented");
+    panic!("not used");
 }
 
 pub fn trinary_choice_create<'a>(
@@ -112,40 +95,28 @@ pub fn trinary_choice_create<'a>(
     _label_right: &'a str,
     _chosen_callback: TrinaryChoiceCb,
 ) -> Component<'a> {
-    panic!("not implemented")
+    panic!("not used")
 }
 
 pub fn confirm_transaction_address_create<'a, 'b>(
-    amount: &'a str,
-    address: &'a str,
-    mut callback: AcceptRejectCb<'b>,
+    _amount: &'a str,
+    _address: &'a str,
+    _callback: AcceptRejectCb<'b>,
 ) -> Component<'b> {
-    let data = crate::testing::DATA.0.borrow();
-    let result = data.ui_transaction_address_create.as_ref().unwrap()(amount, address);
-    callback(result);
-    Component {
-        is_pushed: false,
-        _p: PhantomData,
-    }
+    panic!("not used");
 }
 
 pub fn confirm_transaction_fee_create<'a, 'b>(
-    amount: &'a str,
-    fee: &'a str,
-    longtouch: bool,
-    mut callback: AcceptRejectCb<'b>,
+    _amount: &'a str,
+    _fee: &'a str,
+    _longtouch: bool,
+    _callback: AcceptRejectCb<'b>,
 ) -> Component<'b> {
-    let data = crate::testing::DATA.0.borrow();
-    let result = data.ui_transaction_fee_create.as_ref().unwrap()(amount, fee, longtouch);
-    callback(result);
-    Component {
-        is_pushed: false,
-        _p: PhantomData,
-    }
+    panic!("not used");
 }
 
 pub fn trinary_input_string_set_input(_component: &mut Component, _word: &str) {
-    panic!("not implemented")
+    panic!("not used")
 }
 
 pub fn with_lock_animation<F: Fn() -> R, R>(f: F) -> R {