Make StorageRead::read fallible for MemoryStorage

FuelLabs · Oct 28, 2024 · 9ebefd5 · 9ebefd5
1 parent 97d9b73
commit 9ebefd5
Show file tree

Hide file tree

Showing 11 changed files with 209 additions and 141 deletions.
diff --git a/fuel-vm/src/interpreter/blockchain/code_tests.rs b/fuel-vm/src/interpreter/blockchain/code_tests.rs
@@ -1,17 +1,19 @@
 #![allow(clippy::cast_possible_truncation)]
-use core::convert::Infallible;
 
 use alloc::vec;
 
 use super::*;
 use crate::{
     interpreter::PanicContext,
-    storage::MemoryStorage,
+    storage::{
+        MemoryStorage,
+        MemoryStorageError,
+    },
 };
 use fuel_tx::Contract;
 
 #[test]
-fn test_load_contract_in_script() -> IoResult<(), Infallible> {
+fn test_load_contract_in_script() -> IoResult<(), MemoryStorageError> {
     let mut storage = MemoryStorage::default();
     let mut memory: MemoryInstance = vec![1u8; MEM_SIZE].try_into().unwrap();
     let mut pc = 4;
@@ -70,7 +72,7 @@ fn test_load_contract_in_script() -> IoResult<(), Infallible> {
     Ok(())
 }
 #[test]
-fn test_load_contract_in_call() -> IoResult<(), Infallible> {
+fn test_load_contract_in_call() -> IoResult<(), MemoryStorageError> {
     let mut storage = MemoryStorage::default();
     let mut memory: MemoryInstance = vec![1u8; MEM_SIZE].try_into().unwrap();
     let mut pc = 4;
@@ -130,7 +132,7 @@ fn test_load_contract_in_call() -> IoResult<(), Infallible> {
 }
 
 #[test]
-fn test_code_copy() -> IoResult<(), Infallible> {
+fn test_code_copy() -> IoResult<(), MemoryStorageError> {
     let mut storage = MemoryStorage::default();
     let mut memory: MemoryInstance = vec![1u8; MEM_SIZE].try_into().unwrap();
     let mut cgas = 1000;

diff --git a/fuel-vm/src/interpreter/blockchain/other_tests.rs b/fuel-vm/src/interpreter/blockchain/other_tests.rs
@@ -2,8 +2,10 @@
 
 use alloc::vec;
 
-use crate::storage::MemoryStorage;
-use core::convert::Infallible;
+use crate::storage::{
+    MemoryStorage,
+    MemoryStorageError,
+};
 
 use super::*;
 use crate::interpreter::PanicContext;
@@ -25,7 +27,7 @@ fn test_burn(
     initialize: impl Into<Option<Word>>,
     amount: Word,
     sub_id: [u8; 32],
-) -> IoResult<(), Infallible> {
+) -> IoResult<(), MemoryStorageError> {
     let mut storage = MemoryStorage::default();
     let mut memory: MemoryInstance = vec![1u8; MEM_SIZE].try_into().unwrap();
     let contract_id = ContractId::from([3u8; 32]);
@@ -103,7 +105,7 @@ fn test_mint(
     initialize: impl Into<Option<Word>>,
     amount: Word,
     sub_id: [u8; 32],
-) -> IoResult<(), Infallible> {
+) -> IoResult<(), MemoryStorageError> {
     let mut storage = MemoryStorage::default();
     let mut memory: MemoryInstance = vec![1u8; MEM_SIZE].try_into().unwrap();
     let contract_id = ContractId::from([3u8; 32]);

diff --git a/fuel-vm/src/interpreter/blockchain/smo_tests.rs b/fuel-vm/src/interpreter/blockchain/smo_tests.rs
@@ -1,15 +1,16 @@
 #![allow(clippy::arithmetic_side_effects, clippy::cast_possible_truncation)]
 
-use core::convert::Infallible;
-
 use alloc::{
     vec,
     vec::Vec,
 };
 
 use crate::{
     interpreter::contract::balance as contract_balance,
-    storage::MemoryStorage,
+    storage::{
+        MemoryStorage,
+        MemoryStorageError,
+    },
 };
 
 use super::*;
@@ -206,7 +207,7 @@ fn test_smo(
         max_message_data_length,
         initial_balance,
     }: Input,
-) -> Result<Output, RuntimeError<Infallible>> {
+) -> Result<Output, RuntimeError<MemoryStorageError>> {
     let mut rng = StdRng::seed_from_u64(100);
     let base_asset_id = rng.gen();
 

diff --git a/fuel-vm/src/interpreter/blockchain/test.rs b/fuel-vm/src/interpreter/blockchain/test.rs
@@ -4,16 +4,14 @@ use alloc::{
     vec::Vec,
 };
 
-use core::{
-    convert::Infallible,
-    ops::Range,
-};
+use core::ops::Range;
 
 use crate::{
     context::Context,
     storage::{
         ContractsStateData,
         MemoryStorage,
+        MemoryStorageError,
     },
 };
 use test_case::test_case;
@@ -64,7 +62,7 @@ fn test_state_read_word(
     fp: Word,
     insert: impl Into<Option<Word>>,
     key: Word,
-) -> Result<(Word, Word), RuntimeError<Infallible>> {
+) -> Result<(Word, Word), RuntimeError<MemoryStorageError>> {
     let mut storage = MemoryStorage::default();
     let mut memory: MemoryInstance = vec![1u8; MEM_SIZE].try_into().unwrap();
     memory[0..ContractId::LEN].copy_from_slice(&[3u8; ContractId::LEN][..]);
@@ -134,7 +132,7 @@ fn test_state_write_word(
     fp: Word,
     insert: bool,
     key: Word,
-) -> Result<Word, RuntimeError<Infallible>> {
+) -> Result<Word, RuntimeError<MemoryStorageError>> {
     let mut storage = MemoryStorage::default();
     let mut memory: MemoryInstance = vec![1u8; MEM_SIZE].try_into().unwrap();
     memory[0..ContractId::LEN].copy_from_slice(&[3u8; ContractId::LEN][..]);

diff --git a/fuel-vm/src/interpreter/blockchain/test/scwq.rs b/fuel-vm/src/interpreter/blockchain/test/scwq.rs
@@ -9,6 +9,7 @@ use crate::storage::{
     ContractsState,
     ContractsStateData,
     MemoryStorage,
+    MemoryStorageError,
 };
 
 use super::*;
@@ -95,7 +96,8 @@ struct SCWQInput {
 )]
 fn test_state_clear_qword(
     input: SCWQInput,
-) -> Result<(Vec<([u8; 32], ContractsStateData)>, bool), RuntimeError<Infallible>> {
+) -> Result<(Vec<([u8; 32], ContractsStateData)>, bool), RuntimeError<MemoryStorageError>>
+{
     let SCWQInput {
         input,
         storage_slots,

diff --git a/fuel-vm/src/interpreter/blockchain/test/srwq.rs b/fuel-vm/src/interpreter/blockchain/test/srwq.rs
@@ -2,6 +2,7 @@ use crate::storage::{
     ContractsState,
     ContractsStateData,
     MemoryStorage,
+    MemoryStorageError,
 };
 
 use super::*;
@@ -163,7 +164,7 @@ struct SRWQInput {
 )]
 fn test_state_read_qword(
     input: SRWQInput,
-) -> Result<(MemoryInstance, bool), RuntimeError<Infallible>> {
+) -> Result<(MemoryInstance, bool), RuntimeError<MemoryStorageError>> {
     let SRWQInput {
         storage_slots,
         context,

diff --git a/fuel-vm/src/interpreter/blockchain/test/swwq.rs b/fuel-vm/src/interpreter/blockchain/test/swwq.rs
@@ -9,6 +9,7 @@ use crate::storage::{
     ContractsState,
     ContractsStateData,
     MemoryStorage,
+    MemoryStorageError,
 };
 
 use super::*;
@@ -215,7 +216,8 @@ struct SWWQInput {
 )]
 fn test_state_write_qword(
     input: SWWQInput,
-) -> Result<(Vec<([u8; 32], ContractsStateData)>, u64), RuntimeError<Infallible>> {
+) -> Result<(Vec<([u8; 32], ContractsStateData)>, u64), RuntimeError<MemoryStorageError>>
+{
     let SWWQInput {
         input,
         storage_slots,

diff --git a/fuel-vm/src/interpreter/flow/tests.rs b/fuel-vm/src/interpreter/flow/tests.rs
@@ -1,13 +1,14 @@
 #![allow(clippy::arithmetic_side_effects, clippy::cast_possible_truncation)]
 
-use core::convert::Infallible;
-
 use alloc::{
     vec,
     vec::Vec,
 };
 
-use crate::storage::MemoryStorage;
+use crate::storage::{
+    MemoryStorage,
+    MemoryStorageError,
+};
 
 use super::*;
 use crate::crypto;
@@ -325,7 +326,7 @@ fn mem(set: &[(usize, Vec<u8>)]) -> MemoryInstance {
         ..Default::default()
     } => using check_output(Err(RuntimeError::Recoverable(PanicReason::NotEnoughBalance))); "Transfer too many coins internally"
 )]
-fn test_prepare_call(input: Input) -> Result<Output, RuntimeError<Infallible>> {
+fn test_prepare_call(input: Input) -> Result<Output, RuntimeError<MemoryStorageError>> {
     let Input {
         params,
         mut reg,
@@ -395,8 +396,8 @@ fn test_prepare_call(input: Input) -> Result<Output, RuntimeError<Infallible>> {
 }
 
 fn check_output(
-    expected: Result<Output, RuntimeError<Infallible>>,
-) -> impl FnOnce(Result<Output, RuntimeError<Infallible>>) {
+    expected: Result<Output, RuntimeError<MemoryStorageError>>,
+) -> impl FnOnce(Result<Output, RuntimeError<MemoryStorageError>>) {
     move |result| match (expected, result) {
         (Ok(e), Ok(r)) => {
             assert_eq!(e.reg, r.reg);

diff --git a/fuel-vm/src/memory_client.rs b/fuel-vm/src/memory_client.rs
@@ -11,10 +11,12 @@ use crate::{
         NotSupportedEcal,
     },
     state::StateTransitionRef,
-    storage::MemoryStorage,
+    storage::{
+        MemoryStorage,
+        MemoryStorageError,
+    },
     transactor::Transactor,
 };
-use core::convert::Infallible;
 use fuel_tx::{
     Blob,
     Create,
@@ -103,15 +105,15 @@ where
     pub fn deploy(
         &mut self,
         tx: Checked<Create>,
-    ) -> Result<Create, InterpreterError<Infallible>> {
+    ) -> Result<Create, InterpreterError<MemoryStorageError>> {
         self.transactor.deploy(tx)
     }
 
     /// Executes `Upgrade` transaction.
     pub fn upgrade(
         &mut self,
         tx: Checked<Upgrade>,
-    ) -> Result<Upgrade, InterpreterError<Infallible>> {
+    ) -> Result<Upgrade, InterpreterError<MemoryStorageError>> {
         self.transactor.upgrade(tx)
     }
 

diff --git a/fuel-vm/src/storage.rs b/fuel-vm/src/storage.rs
@@ -34,6 +34,8 @@ pub use interpreter::{
 };
 #[cfg(feature = "test-helpers")]
 pub use memory::MemoryStorage;
+#[cfg(feature = "test-helpers")]
+pub use memory::MemoryStorageError;
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;