Merge branch 'master' into cl/try-for-lazy

crates/env/src/engine/off_chain/impls.rs

@@ -205,10 +205,12 @@ impl EnvBackend for EnvInstance {
         K: scale::Encode,
         R: Storable,
     {
-        let mut output: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE];
-        match self.engine.get_storage(&key.encode(), &mut &mut output[..]) {
-            Ok(_) => (),
-            Err(ext::Error::KeyNotFound) => return Ok(None),
+        match self.engine.get_storage(&key.encode()) {
+            Ok(res) => {
+                let decoded = decode_all(&mut &res[..])?;
+                Ok(Some(decoded))
+            }
+            Err(ext::Error::KeyNotFound) => Ok(None),
             Err(_) => panic!("encountered unexpected error"),
         }
     }
@@ -218,13 +220,12 @@ impl EnvBackend for EnvInstance {
         K: scale::Encode,
         R: Storable,
     {
-        let mut output: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE];
-        match self
-            .engine
-            .take_storage(&key.encode(), &mut &mut output[..])
-        {
-            Ok(_) => (),
-            Err(ext::Error::KeyNotFound) => return Ok(None),
+        match self.engine.take_storage(&key.encode()) {
+            Ok(output) => {
+                let decoded = decode_all(&mut &output[..])?;
+                Ok(Some(decoded))
+            }
+            Err(ext::Error::KeyNotFound) => Ok(None),
             Err(_) => panic!("encountered unexpected error"),
         }
     }