Update remaining Zeitgeist pallets

primitives/src/constants/mock.rs

@@ -164,7 +164,7 @@ parameter_types! {
 // Shared within tests
 // Balance
 parameter_types! {
-    pub const ExistentialDeposit: u128 = CENT;
+    pub const ExistentialDeposit: u128 = 2;
     pub const MaxLocks: u32 = 50;
     pub const MaxReserves: u32 = 50;
 }
@@ -191,7 +191,7 @@ parameter_type_with_key! {
 
 // System
 parameter_types! {
-    pub const BlockHashCount: u64 = 250;
+    pub const BlockHashCount: u32 = 250;
 }
 
 // Time

primitives/src/math/checked_ops_res.rs

@@ -15,12 +15,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
 
-use frame_support::dispatch::DispatchError;
 use num_traits::{checked_pow, One};
 use sp_arithmetic::{
     traits::{CheckedAdd, CheckedDiv, CheckedMul, CheckedRem, CheckedSub},
     ArithmeticError,
 };
+use sp_runtime::DispatchError;
 
 pub trait CheckedAddRes
 where

primitives/src/math/fixed.rs

@@ -31,11 +31,12 @@ use alloc::{
 };
 use core::{cmp::Ordering, convert::TryFrom, marker::PhantomData};
 use fixed::{traits::Fixed, ParseFixedError};
-use frame_support::{dispatch::DispatchError, ensure};
+use frame_support::ensure;
 use sp_arithmetic::{
     traits::{AtLeast32BitUnsigned, Zero},
     ArithmeticError,
 };
+use sp_runtime::DispatchError;
 
 /// Trait for safely obtaining constants converted to generic types in a Substrate context.
 pub trait BaseProvider<T> {

primitives/src/traits.rs

@@ -27,7 +27,6 @@ mod market_commons_pallet_api;
 mod market_id;
 mod market_transition_api;
 mod swaps;
-mod weights;
 mod zeitgeist_asset;
 
 pub use complete_set_operations_api::*;
@@ -41,5 +40,4 @@ pub use market_commons_pallet_api::*;
 pub use market_id::*;
 pub use market_transition_api::*;
 pub use swaps::*;
-pub use weights::*;
 pub use zeitgeist_asset::*;

primitives/src/traits/hybrid_router_amm_api.rs

@@ -16,7 +16,7 @@
 // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::hybrid_router_api_types::{AmmSoftFail, AmmTrade, ApiError};
-use frame_support::dispatch::DispatchError;
+use sp_runtime::DispatchError;
 
 /// A type alias for the return struct of AMM buy and sell.
 type AmmTradeOf<T> = AmmTrade<<T as HybridRouterAmmApi>::Balance>;

primitives/src/traits/hybrid_router_orderbook_api.rs

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
 
-use frame_support::dispatch::DispatchError;
+use sp_runtime::DispatchError;
 
 use crate::hybrid_router_api_types::{ApiError, OrderbookSoftFail, OrderbookTrade};
 

primitives/src/traits/market_commons_pallet_api.rs

@@ -22,14 +22,18 @@ use crate::{
     traits::MarketBuilderTrait,
     types::{BaseAsset, Market, PoolId},
 };
+use alloc::fmt::Debug;
 use frame_support::{
-    dispatch::{fmt::Debug, DispatchError, DispatchResult},
+    dispatch::DispatchResult,
     pallet_prelude::{MaybeSerializeDeserialize, Member},
     storage::PrefixIterator,
     Parameter,
 };
 use parity_scale_codec::{FullCodec, HasCompact, MaxEncodedLen};
-use sp_runtime::traits::{AtLeast32Bit, AtLeast32BitUnsigned};
+use sp_runtime::{
+    traits::{AtLeast32Bit, AtLeast32BitUnsigned},
+    DispatchError,
+};
 
 // Abstraction of the market type, which is not a part of `MarketCommonsPalletApi` because Rust
 // doesn't support type aliases in traits.

primitives/src/traits/swaps.rs

@@ -18,8 +18,9 @@
 
 use crate::types::PoolId;
 use alloc::vec::Vec;
-use frame_support::dispatch::{DispatchError, DispatchResult, Weight};
+use frame_support::{dispatch::DispatchResult, weights::Weight};
 use parity_scale_codec::{HasCompact, MaxEncodedLen};
+use sp_runtime::DispatchError;
 
 pub trait Swaps<AccountId> {
     type Asset: MaxEncodedLen;

primitives/src/types.rs

@@ -21,7 +21,7 @@ pub use crate::{
 };
 #[cfg(feature = "arbitrary")]
 use arbitrary::{Arbitrary, Result, Unstructured};
-use frame_support::dispatch::Weight;
+use frame_support::weights::Weight;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{

zrml/asset-router/src/lib.rs

@@ -38,18 +38,21 @@ pub mod pallet {
     pub(crate) use alloc::collections::BTreeMap;
     pub(crate) use core::{fmt::Debug, marker::PhantomData};
     pub(crate) use frame_support::{
-        ensure, log,
-        pallet_prelude::{DispatchError, DispatchResult, Hooks, StorageValue, ValueQuery, Weight},
+        ensure,
+        pallet_prelude::{DispatchResult, Hooks, StorageValue, ValueQuery, Weight},
         require_transactional,
         traits::{
             tokens::{
-                fungibles::{Create, Destroy, Inspect, Mutate, Transfer, Unbalanced},
-                DepositConsequence, WithdrawConsequence,
+                fungibles::{Create, Destroy, Inspect, Mutate, Unbalanced},
+                DepositConsequence, Fortitude, Precision, Preservation, Provenance,
+                WithdrawConsequence,
             },
             BalanceStatus as Status, ConstU32,
         },
         BoundedVec, Parameter,
     };
+    pub(crate) use frame_system::pallet_prelude::BlockNumberFor;
+    use log;
     pub(crate) use orml_traits::{
         arithmetic::Signed,
         currency::{
@@ -62,13 +65,10 @@ pub mod pallet {
     use parity_scale_codec::{FullCodec, MaxEncodedLen};
     use scale_info::TypeInfo;
     pub(crate) use sp_runtime::{
-        traits::{
-            AtLeast32BitUnsigned, Bounded, Get, MaybeSerializeDeserialize, Member, Saturating, Zero,
-        },
-        FixedPointOperand, SaturatedConversion,
+        traits::{AtLeast32BitUnsigned, Bounded, Get, MaybeSerializeDeserialize, Member, Zero},
+        DispatchError, FixedPointOperand, SaturatedConversion,
     };
     use zeitgeist_macros::unreachable_non_terminating;
-    pub(crate) use zeitgeist_primitives::traits::CheckedDivPerComponent;
 
     pub(crate) const LOG_TARGET: &str = "runtime::asset-router";
     pub(crate) const MAX_ASSET_DESTRUCTIONS_PER_BLOCK: u8 = 128;
@@ -81,7 +81,6 @@ pub mod pallet {
         Create<T::AccountId, AssetId = A, Balance = T::Balance>
         + Destroy<T::AccountId, AssetId = A, Balance = T::Balance>
         + Inspect<T::AccountId, AssetId = A, Balance = T::Balance>
-        + Transfer<T::AccountId, AssetId = A, Balance = T::Balance>
         + Mutate<T::AccountId, AssetId = A, Balance = T::Balance>
         + Unbalanced<T::AccountId, AssetId = A, Balance = T::Balance>
     {
@@ -92,7 +91,6 @@ pub mod pallet {
         G: Create<T::AccountId, AssetId = A, Balance = T::Balance>
             + Destroy<T::AccountId, AssetId = A, Balance = T::Balance>
             + Inspect<T::AccountId, AssetId = A, Balance = T::Balance>
-            + Transfer<T::AccountId, AssetId = A, Balance = T::Balance>
             + Mutate<T::AccountId, AssetId = A, Balance = T::Balance>
             + Unbalanced<T::AccountId, AssetId = A, Balance = T::Balance>,
         T: Config,
@@ -216,14 +214,16 @@ pub mod pallet {
         UnknownAsset,
         /// Operation is not supported for given asset
         Unsupported,
+        /// Only a partial amount was deposited
+        DepositOnlyPartial,
     }
 
     #[pallet::pallet]
     pub struct Pallet<T>(PhantomData<T>);
 
     #[pallet::hooks]
-    impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-        fn on_idle(_: T::BlockNumber, mut remaining_weight: Weight) -> Weight {
+    impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+        fn on_idle(_: BlockNumberFor<T>, mut remaining_weight: Weight) -> Weight {
             let max_extra_weight = Self::on_idle_max_extra_weight();
 
             if !remaining_weight