refactor: use mv crate (hyperledger-iroha#5018)

Signed-off-by: Shanin Roman <[email protected]>

Cargo.toml

@@ -123,7 +123,7 @@ parity-scale-codec = { version = "3.6.12", default-features = false }
 json5 = "0.4.1"
 toml = "0.8.16"
 
-storage = { git = "https://github.com/Erigara/storage.git", rev = "cf82588d20494a1c1613ea2f4faa1e66bd827b5c" }
+mv = { version = "0.1.0" }
 
 [workspace.lints]
 rustdoc.private_doc_tests = "deny"

core/Cargo.toml

@@ -45,7 +45,7 @@ iroha_telemetry = { workspace = true }
 iroha_primitives = { workspace = true }
 iroha_genesis = { workspace = true }
 iroha_wasm_codec = { workspace = true }
-storage = { workspace = true, features = ["serde"] }
+mv = { workspace = true, features = ["serde"] }
 
 async-trait = { workspace = true }
 dashmap = { workspace = true }

core/src/block.rs

@@ -283,7 +283,7 @@ mod valid {
     use commit::CommittedBlock;
     use indexmap::IndexMap;
     use iroha_data_model::{account::AccountId, events::pipeline::PipelineEventBox, ChainId};
-    use storage::storage::StorageReadOnly;
+    use mv::storage::StorageReadOnly;
 
     use super::*;
     use crate::{state::StateBlock, sumeragi::network_topology::Role};

core/src/metrics.rs

@@ -4,8 +4,8 @@ use std::{num::NonZeroUsize, sync::Arc, time::SystemTime};
 
 use eyre::{Result, WrapErr as _};
 use iroha_telemetry::metrics::Metrics;
+use mv::storage::StorageReadOnly;
 use parking_lot::Mutex;
-use storage::storage::StorageReadOnly;
 
 use crate::{
     kura::Kura,

core/src/smartcontracts/isi/mod.rs

@@ -16,7 +16,7 @@ use iroha_data_model::{
     prelude::*,
 };
 use iroha_logger::prelude::*;
-use storage::storage::StorageReadOnly;
+use mv::storage::StorageReadOnly;
 
 use super::Execute;
 use crate::{

core/src/smartcontracts/isi/triggers/set.rs

@@ -19,17 +19,17 @@ use iroha_data_model::{
     query::error::FindError,
     transaction::WasmSmartContract,
 };
-use serde::{
-    de::{DeserializeSeed, MapAccess, Visitor},
-    Deserialize, Serialize,
-};
-use storage::{
+use mv::{
     cell::{Block as CellBlock, Cell, Transaction as CellTransaction, View as CellView},
     storage::{
         Block as StorageBlock, Storage, StorageReadOnly, Transaction as StorageTransaction,
         View as StorageView,
     },
 };
+use serde::{
+    de::{DeserializeSeed, MapAccess, Visitor},
+    Deserialize, Serialize,
+};
 use thiserror::Error;
 
 use crate::{
@@ -207,11 +207,10 @@ impl<'de> DeserializeSeed<'de> for WasmSeed<'_, Set> {
                             ids = Some(map.next_value()?);
                         }
                         "contracts" => {
-                            contracts =
-                                Some(map.next_value_seed(storage::serde::StorageSeeded {
-                                    kseed: PhantomData,
-                                    vseed: self.loader.cast::<WasmSmartContractEntry>(),
-                                })?);
+                            contracts = Some(map.next_value_seed(mv::serde::StorageSeeded {
+                                kseed: PhantomData,
+                                vseed: self.loader.cast::<WasmSmartContractEntry>(),
+                            })?);
                         }
                         "matched_ids" => {
                             matched_ids = Some(map.next_value()?);
@@ -710,7 +709,7 @@ impl<'block, 'set> SetTransaction<'block, 'set> {
     /// # Errors
     ///
     /// Return [`Err`] if failed to preload wasm trigger
-    fn add_to<F: TriggeringEventFilter + storage::Value>(
+    fn add_to<F: TriggeringEventFilter + mv::Value>(
         &mut self,
         engine: &wasmtime::Engine,
         trigger: SpecializedTrigger<F>,
@@ -872,7 +871,7 @@ impl<'block, 'set> SetTransaction<'block, 'set> {
     /// Note that this function doesn't remove the trigger from [`Set::ids`].
     ///
     /// Returns `true` if trigger was removed and `false` otherwise.
-    fn remove_from<F: storage::Value + EventFilter>(
+    fn remove_from<F: mv::Value + EventFilter>(
         contracts: &mut WasmSmartContractMapTransaction<'block, 'set>,
         triggers: &mut StorageTransaction<'block, 'set, TriggerId, LoadedAction<F>>,
         trigger_id: TriggerId,
@@ -936,7 +935,7 @@ impl<'block, 'set> SetTransaction<'block, 'set> {
     }
 
     /// Remove actions with zero execution count from `triggers`
-    fn remove_zeros<F: storage::Value + EventFilter>(
+    fn remove_zeros<F: mv::Value + EventFilter>(
         ids: &mut StorageTransaction<'block, 'set, TriggerId, TriggeringEventType>,
         contracts: &mut WasmSmartContractMapTransaction<'block, 'set>,
         triggers: &mut StorageTransaction<'block, 'set, TriggerId, LoadedAction<F>>,

core/src/state.rs

@@ -24,20 +24,20 @@ use iroha_data_model::{
 };
 use iroha_logger::prelude::*;
 use iroha_primitives::{must_use::MustUse, numeric::Numeric, small::SmallVec};
+use mv::{
+    cell::{Block as CellBlock, Cell, Transaction as CellTransaction, View as CellView},
+    storage::{
+        Block as StorageBlock, RangeIter, Storage, StorageReadOnly,
+        Transaction as StorageTransaction, View as StorageView,
+    },
+};
 use nonzero_ext::nonzero;
 use parking_lot::Mutex;
 use range_bounds::*;
 use serde::{
     de::{DeserializeSeed, MapAccess, Visitor},
     Deserializer, Serialize,
 };
-use storage::{
-    cell::{Block as CellBlock, Cell, Transaction as CellTransaction, View as CellView},
-    storage::{
-        Block as StorageBlock, RangeIter, Storage, StorageReadOnly,
-        Transaction as StorageTransaction, View as StorageView,
-    },
-};
 
 use crate::{
     block::CommittedBlock,
@@ -1871,7 +1871,7 @@ mod range_bounds {
 }
 
 pub(crate) mod deserialize {
-    use storage::serde::CellSeeded;
+    use mv::serde::CellSeeded;
 
     use super::*;
 

core/src/tx.rs

@@ -20,7 +20,7 @@ use iroha_data_model::{
 };
 use iroha_logger::{debug, error};
 use iroha_macro::FromVariant;
-use storage::storage::StorageReadOnly;
+use mv::storage::StorageReadOnly;
 
 use crate::{
     smartcontracts::wasm,