systems: use the concrete storage error and result type

anoma · Jul 30, 2024 · 98aa9df · 98aa9df
1 parent 7992a2e
commit 98aa9df
Show file tree

Hide file tree

Showing 18 changed files with 115 additions and 228 deletions.
diff --git a/crates/governance/src/lib.rs b/crates/governance/src/lib.rs
@@ -51,12 +51,7 @@ impl<S> Read<S> for Store<S>
 where
     S: StorageRead,
 {
-    type Err = namada_state::StorageError;
-
-    fn is_proposal_accepted(
-        storage: &S,
-        tx_data: &[u8],
-    ) -> Result<bool, Self::Err> {
+    fn is_proposal_accepted(storage: &S, tx_data: &[u8]) -> Result<bool> {
         storage::is_proposal_accepted(storage, tx_data)
     }
 }
diff --git a/crates/governance/src/vp/mod.rs b/crates/governance/src/vp/mod.rs
@@ -66,10 +66,7 @@ where
     S: StateRead,
     CA: 'static + Clone,
     EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL>,
-    PoS: proof_of_stake::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = namada_state::StorageError,
-        >,
+    PoS: proof_of_stake::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
     TokenKeys: token::Keys,
 {
     type Error = Error;
@@ -220,10 +217,7 @@ where
     S: StateRead,
     CA: 'static + Clone,
     EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL>,
-    PoS: proof_of_stake::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = namada_state::StorageError,
-        >,
+    PoS: proof_of_stake::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
     TokenKeys: token::Keys,
 {
     /// Instantiate a Governance VP

diff --git a/crates/ibc/src/lib.rs b/crates/ibc/src/lib.rs
@@ -217,11 +217,9 @@ impl<S> namada_systems::ibc::Read<S> for Store<S>
 where
     S: StorageRead,
 {
-    type Err = namada_storage::Error;
-
     fn try_extract_masp_tx_from_envelope(
         tx_data: &[u8],
-    ) -> Result<Option<masp_primitives::transaction::Transaction>, Self::Err>
+    ) -> namada_storage::Result<Option<masp_primitives::transaction::Transaction>>
     {
         let msg = decode_message(tx_data).into_storage_result().ok();
         let tx = if let Some(IbcMessage::Envelope(ref envelope)) = msg {
@@ -241,7 +239,7 @@ where
         tx_data: &[u8],
         mut accum: ChangedBalances,
         keys_changed: &BTreeSet<namada_core::storage::Key>,
-    ) -> Result<ChangedBalances, Self::Err> {
+    ) -> namada_storage::Result<ChangedBalances> {
         let msg = decode_message(tx_data).into_storage_result().ok();
         match msg {
             None => {}

diff --git a/crates/ibc/src/vp/context.rs b/crates/ibc/src/vp/context.rs
@@ -11,6 +11,7 @@ use namada_core::storage::{BlockHeight, Epoch, Epochs, Header, Key, TxIndex};
 use namada_events::Event;
 use namada_gas::MEMORY_ACCESS_GAS_PER_BYTE;
 use namada_state::write_log::StorageModification;
+pub use namada_state::StorageResult as Result;
 use namada_state::{
     PrefixIter, StateRead, StorageError, StorageRead, StorageWrite,
 };
@@ -22,9 +23,6 @@ use crate::event::IbcEvent;
 use crate::storage::is_ibc_key;
 use crate::{IbcCommonContext, IbcStorageContext};
 
-/// Result of a storage API call.
-pub type Result<T> = std::result::Result<T, namada_state::StorageError>;
-
 /// Pseudo execution environment context for ibc native vp
 #[derive(Debug)]
 pub struct PseudoExecutionContext<'view, 'a, S, CA, EVAL, Token>
@@ -214,10 +212,7 @@ where
     EVAL: 'static + VpEvaluator<'a, S, CA, EVAL>,
     CA: 'static + Clone,
     Token: token::Keys
-        + token::Write<
-            PseudoExecutionStorage<'view, 'a, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+        + token::Write<PseudoExecutionStorage<'view, 'a, S, CA, EVAL>>,
 {
     type Storage = PseudoExecutionStorage<'view, 'a, S, CA, EVAL>;
 
@@ -288,10 +283,7 @@ where
     CA: 'static + Clone,
     EVAL: 'static + VpEvaluator<'a, S, CA, EVAL>,
     Token: token::Keys
-        + token::Write<
-            PseudoExecutionStorage<'view, 'a, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+        + token::Write<PseudoExecutionStorage<'view, 'a, S, CA, EVAL>>,
 {
 }
 

diff --git a/crates/ibc/src/vp/mod.rs b/crates/ibc/src/vp/mod.rs
@@ -18,7 +18,7 @@ use namada_core::collections::HashSet;
 use namada_core::storage::Key;
 use namada_gas::{IBC_ACTION_EXECUTE_GAS, IBC_ACTION_VALIDATE_GAS};
 use namada_state::write_log::StorageModification;
-use namada_state::{StateRead, StorageError};
+use namada_state::StateRead;
 use namada_systems::trans_token::{self as token, Amount};
 use namada_systems::{governance, parameters, proof_of_stake};
 use namada_tx::BatchedTxRef;
@@ -84,24 +84,13 @@ where
     S: 'static + StateRead,
     EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL> + Debug,
     CA: 'static + Clone + Debug,
-    Gov: governance::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+    Gov: governance::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
     Params: parameters::Keys
-        + parameters::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+        + parameters::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
     Token: token::Keys
-        + token::Write<
-            PseudoExecutionStorage<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        > + Debug,
-    PoS: proof_of_stake::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+        + token::Write<PseudoExecutionStorage<'view, 'ctx, S, CA, EVAL>>
+        + Debug,
+    PoS: proof_of_stake::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
 {
     type Error = Error;
 
@@ -151,19 +140,11 @@ where
     EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL> + Debug,
     CA: 'static + Clone + Debug,
     Params: parameters::Keys
-        + parameters::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+        + parameters::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
     Token: token::Keys
-        + token::Write<
-            PseudoExecutionStorage<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        > + Debug,
-    PoS: proof_of_stake::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+        + token::Write<PseudoExecutionStorage<'view, 'ctx, S, CA, EVAL>>
+        + Debug,
+    PoS: proof_of_stake::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
 {
     /// Instantiate IBC VP
     pub fn new(ctx: Ctx<'ctx, S, CA, EVAL>) -> Self {

diff --git a/crates/parameters/src/lib.rs b/crates/parameters/src/lib.rs
@@ -49,23 +49,19 @@ impl<S> Read<S> for Store<S>
 where
     S: StorageRead,
 {
-    type Err = namada_storage::Error;
-
-    fn read(storage: &S) -> Result<Parameters, Self::Err> {
+    fn read(storage: &S) -> Result<Parameters> {
         read(storage)
     }
 
-    fn masp_epoch_multiplier(storage: &S) -> Result<u64, Self::Err> {
+    fn masp_epoch_multiplier(storage: &S) -> Result<u64> {
         read_masp_epoch_multiplier_parameter(storage)
     }
 
-    fn epoch_duration_parameter(
-        storage: &S,
-    ) -> Result<EpochDuration, Self::Err> {
+    fn epoch_duration_parameter(storage: &S) -> Result<EpochDuration> {
         read_epoch_duration_parameter(storage)
     }
 
-    fn is_native_token_transferable(storage: &S) -> Result<bool, Self::Err> {
+    fn is_native_token_transferable(storage: &S) -> Result<bool> {
         storage::is_native_token_transferable(storage)
     }
 }
@@ -74,10 +70,7 @@ impl<S> Write<S> for Store<S>
 where
     S: StorageRead + StorageWrite,
 {
-    fn write(
-        storage: &mut S,
-        parameters: &Parameters,
-    ) -> Result<(), Self::Err> {
+    fn write(storage: &mut S, parameters: &Parameters) -> Result<()> {
         init_storage(parameters, storage)
     }
 }

diff --git a/crates/parameters/src/vp.rs b/crates/parameters/src/vp.rs
@@ -6,7 +6,7 @@ use std::marker::PhantomData;
 use namada_core::address::Address;
 use namada_core::booleans::BoolResultUnitExt;
 use namada_core::storage::Key;
-use namada_state::{StateRead, StorageError};
+use namada_state::StateRead;
 use namada_systems::governance;
 use namada_tx::BatchedTxRef;
 use namada_vp::native_vp::{
@@ -44,10 +44,7 @@ where
     S: 'static + StateRead,
     CA: 'static + Clone,
     EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL>,
-    Gov: governance::Read<
-            CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+    Gov: governance::Read<CtxPreStorageRead<'view, 'ctx, S, CA, EVAL>>,
 {
     type Error = Error;
 
@@ -92,10 +89,7 @@ where
     S: 'static + StateRead,
     CA: 'static + Clone,
     EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL>,
-    Gov: governance::Read<
-            CtxPreStorageRead<'ctx, 'ctx, S, CA, EVAL>,
-            Err = StorageError,
-        >,
+    Gov: governance::Read<CtxPreStorageRead<'ctx, 'ctx, S, CA, EVAL>>,
 {
     /// Instantiate parameters VP
     pub fn new(ctx: Ctx<'ctx, S, CA, EVAL>) -> Self {