Merge branch 'firmware_protection' into env_console

src/env/test/mod.rs

@@ -4,13 +4,15 @@ use crate::ctap::hid::ChannelID;
 use crate::ctap::status_code::Ctap2StatusCode;
 use crate::env::{Env, UserPresence};
 use crypto::rng256::ThreadRng256;
-use persistent_store::{BufferOptions, BufferStorage, StorageResult};
+use persistent_store::{BufferOptions, BufferStorage, Store};
 
 mod upgrade_storage;
 
 pub struct TestEnv {
     rng: ThreadRng256,
     user_presence: TestUserPresence,
+    store: Store<BufferStorage>,
+    upgrade_storage: Option<BufferUpgradeStorage>,
 }
 
 pub struct TestUserPresence {
@@ -25,13 +27,40 @@ impl core::fmt::Write for TestWrite {
     }
 }
 
+fn new_storage() -> BufferStorage {
+    // Use the Nordic configuration.
+    const PAGE_SIZE: usize = 0x1000;
+    const NUM_PAGES: usize = 20;
+    let store = vec![0xff; NUM_PAGES * PAGE_SIZE].into_boxed_slice();
+    let options = BufferOptions {
+        word_size: 4,
+        page_size: PAGE_SIZE,
+        max_word_writes: 2,
+        max_page_erases: 10000,
+        strict_mode: true,
+    };
+    BufferStorage::new(store, options)
+}
+
 impl TestEnv {
     pub fn new() -> Self {
         let rng = ThreadRng256 {};
         let user_presence = TestUserPresence {
             check: Box::new(|_| Ok(())),
         };
-        TestEnv { rng, user_presence }
+        let storage = new_storage();
+        let store = Store::new(storage).ok().unwrap();
+        let upgrade_storage = Some(BufferUpgradeStorage::new().unwrap());
+        TestEnv {
+            rng,
+            user_presence,
+            store,
+            upgrade_storage,
+        }
+    }
+
+    pub fn disable_upgrade_storage(&mut self) {
+        self.upgrade_storage = None;
     }
 }
 
@@ -69,23 +98,12 @@ impl Env for TestEnv {
         &mut self.user_presence
     }
 
-    fn storage(&mut self) -> StorageResult<Self::Storage> {
-        // Use the Nordic configuration.
-        const PAGE_SIZE: usize = 0x1000;
-        const NUM_PAGES: usize = 20;
-        let store = vec![0xff; NUM_PAGES * PAGE_SIZE].into_boxed_slice();
-        let options = BufferOptions {
-            word_size: 4,
-            page_size: PAGE_SIZE,
-            max_word_writes: 2,
-            max_page_erases: 10000,
-            strict_mode: true,
-        };
-        Ok(BufferStorage::new(store, options))
+    fn store(&mut self) -> &mut Store<Self::Storage> {
+        &mut self.store
     }
 
-    fn upgrade_storage(&mut self) -> StorageResult<Self::UpgradeStorage> {
-        BufferUpgradeStorage::new()
+    fn upgrade_storage(&mut self) -> Option<&mut Self::UpgradeStorage> {
+        self.upgrade_storage.as_mut()
     }
 
     fn firmware_protection(&mut self) -> &mut Self::FirmwareProtection {