Add Storage and UpgradeStorage to Env

src/ctap/hid/mod.rs

@@ -146,12 +146,12 @@ impl CtapHid {
 
     // Process an incoming USB HID packet, and optionally returns a list of outgoing packets to
     // send as a reply.
-    pub fn process_hid_packet(
+    pub fn process_hid_packet<E: Env>(
         &mut self,
-        env: &mut impl Env,
+        env: &mut E,
         packet: &HidPacket,
         clock_value: ClockValue,
-        ctap_state: &mut CtapState,
+        ctap_state: &mut CtapState<E>,
     ) -> HidPacketIterator {
         // TODO: Send COMMAND_KEEPALIVE every 100ms?
         match self
@@ -442,10 +442,10 @@ mod test {
     const DUMMY_CLOCK_VALUE: ClockValue = ClockValue::new(0, CLOCK_FREQUENCY_HZ);
     const DUMMY_TIMESTAMP: Timestamp<isize> = Timestamp::from_ms(0);
 
-    fn process_messages(
-        env: &mut impl Env,
+    fn process_messages<E: Env>(
+        env: &mut E,
         ctap_hid: &mut CtapHid,
-        ctap_state: &mut CtapState,
+        ctap_state: &mut CtapState<E>,
         request: Vec<Message>,
     ) -> Option<Vec<Message>> {
         let mut result = Vec::new();
@@ -466,10 +466,10 @@ mod test {
         Some(result)
     }
 
-    fn cid_from_init(
-        env: &mut impl Env,
+    fn cid_from_init<E: Env>(
+        env: &mut E,
         ctap_hid: &mut CtapHid,
-        ctap_state: &mut CtapState,
+        ctap_state: &mut CtapState<E>,
     ) -> ChannelID {
         let nonce = vec![0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0];
         let reply = process_messages(