Migrate xpallets-assets to attribute macro

xpallets/assets/src/mock.rs

@@ -8,7 +8,7 @@ use sp_runtime::{
     traits::{BlakeTwo256, IdentityLookup},
 };
 
-use frame_support::{parameter_types, sp_io};
+use frame_support::{parameter_types, sp_io, traits::GenesisBuild};
 
 use chainx_primitives::AssetId;
 pub use xp_protocol::X_BTC;

xpallets/assets/src/multicurrency.rs

@@ -10,7 +10,7 @@ use frame_support::{
     ensure,
     log::error,
     traits::{BalanceStatus, LockIdentifier},
-    transactional, IterableStorageDoubleMap,
+    transactional,
 };
 
 use orml_traits::{
@@ -22,9 +22,9 @@ use chainx_primitives::AssetId;
 use xpallet_support::traits::TreasuryAccount;
 
 use crate::types::{AssetType, BalanceLock};
-use crate::{AssetBalance, BalanceOf, Config, Error, Module};
+use crate::{AssetBalance, BalanceOf, Config, Error, Pallet};
 
-impl<T: Config> MultiCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiCurrency<T::AccountId> for Pallet<T> {
     type CurrencyId = AssetId;
     type Balance = BalanceOf<T>;
 
@@ -173,7 +173,7 @@ impl<T: Config> MultiCurrency<T::AccountId> for Module<T> {
     }
 }
 
-impl<T: Config> MultiCurrencyExtended<T::AccountId> for Module<T> {
+impl<T: Config> MultiCurrencyExtended<T::AccountId> for Pallet<T> {
     type Amount = T::Amount;
 
     fn update_balance(
@@ -195,7 +195,7 @@ impl<T: Config> MultiCurrencyExtended<T::AccountId> for Module<T> {
     }
 }
 
-impl<T: Config> MultiReservableCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiReservableCurrency<T::AccountId> for Pallet<T> {
     fn can_reserve(
         currency_id: Self::CurrencyId,
         who: &T::AccountId,
@@ -326,7 +326,7 @@ impl<T: Config> MultiReservableCurrency<T::AccountId> for Module<T> {
     }
 }
 
-impl<T: Config> MultiLockableCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiLockableCurrency<T::AccountId> for Pallet<T> {
     type Moment = T::BlockNumber;
 
     fn set_lock(
@@ -404,7 +404,7 @@ impl<T: Config> MultiLockableCurrency<T::AccountId> for Module<T> {
     }
 }
 
-impl<T: Config> MergeAccount<T::AccountId> for Module<T> {
+impl<T: Config> MergeAccount<T::AccountId> for Pallet<T> {
     #[transactional]
     fn merge_account(source: &T::AccountId, dest: &T::AccountId) -> DispatchResult {
         AssetBalance::<T>::iter_prefix(source).try_for_each(

xpallets/assets/src/trigger.rs

@@ -6,7 +6,7 @@ use chainx_primitives::AssetId;
 
 use crate::traits::OnAssetChanged;
 use crate::types::{AssetErr, AssetType};
-use crate::{BalanceOf, Config, Event, Module};
+use crate::{BalanceOf, Config, Event, Pallet};
 
 impl<AccountId, Balance> OnAssetChanged<AccountId, Balance> for () {}
 
@@ -32,7 +32,7 @@ impl<T: Config> AssetChangedTrigger<T> {
         to_type: AssetType,
         value: BalanceOf<T>,
     ) -> Result<(), AssetErr> {
-        Module::<T>::deposit_event(Event::<T>::Moved(
+        Pallet::<T>::deposit_event(Event::<T>::Moved(
             *id,
             from.clone(),
             from_type,
@@ -49,7 +49,7 @@ impl<T: Config> AssetChangedTrigger<T> {
     }
 
     pub fn on_issue_post(id: &AssetId, who: &T::AccountId, value: BalanceOf<T>) -> DispatchResult {
-        Module::<T>::deposit_event(Event::<T>::Issued(*id, who.clone(), value));
+        Pallet::<T>::deposit_event(Event::<T>::Issued(*id, who.clone(), value));
         T::OnAssetChanged::on_issue_post(id, who, value)?;
         Ok(())
     }
@@ -63,7 +63,7 @@ impl<T: Config> AssetChangedTrigger<T> {
         who: &T::AccountId,
         value: BalanceOf<T>,
     ) -> DispatchResult {
-        Module::<T>::deposit_event(Event::<T>::Destroyed(*id, who.clone(), value));
+        Pallet::<T>::deposit_event(Event::<T>::Destroyed(*id, who.clone(), value));
         T::OnAssetChanged::on_destroy_post(id, who, value)?;
         Ok(())
     }
@@ -74,7 +74,7 @@ impl<T: Config> AssetChangedTrigger<T> {
         type_: AssetType,
         value: BalanceOf<T>,
     ) -> DispatchResult {
-        Module::<T>::deposit_event(Event::<T>::BalanceSet(*id, who.clone(), type_, value));
+        Pallet::<T>::deposit_event(Event::<T>::BalanceSet(*id, who.clone(), type_, value));
         T::OnAssetChanged::on_set_balance(id, who, type_, value)?;
         Ok(())
     }

xpallets/assets/src/weights.rs

@@ -32,7 +32,7 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
     fn transfer() -> Weight;
     fn force_transfer() -> Weight;
-    fn set_balance(n: u32) -> Weight;
+    fn set_balance() -> Weight;
     fn set_asset_limit() -> Weight;
 }
 
@@ -49,7 +49,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
             .saturating_add(T::DbWeight::get().reads(8 as Weight))
             .saturating_add(T::DbWeight::get().writes(6 as Weight))
     }
-    fn set_balance(_n: u32) -> Weight {
+    fn set_balance() -> Weight {
         (218_742_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(3 as Weight))
             .saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -73,7 +73,7 @@ impl WeightInfo for () {
             .saturating_add(RocksDbWeight::get().reads(8 as Weight))
             .saturating_add(RocksDbWeight::get().writes(6 as Weight))
     }
-    fn set_balance(_n: u32) -> Weight {
+    fn set_balance() -> Weight {
         (218_742_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(3 as Weight))
             .saturating_add(RocksDbWeight::get().writes(3 as Weight))

xpallets/dex/spot/src/mock.rs

@@ -5,7 +5,11 @@ use std::{
     collections::{BTreeMap, HashSet},
 };
 
-use frame_support::{parameter_types, traits::Get, weights::Weight};
+use frame_support::{
+    parameter_types,
+    traits::{GenesisBuild, Get},
+    weights::Weight,
+};
 use sp_core::H256;
 use sp_runtime::{
     testing::Header,

xpallets/gateway/common/src/mock.rs

@@ -3,8 +3,10 @@
 use std::{cell::RefCell, convert::TryFrom, time::Duration};
 
 use codec::{Decode, Encode};
-use frame_support::traits::UnixTime;
-use frame_support::{parameter_types, sp_io};
+use frame_support::{
+    parameter_types, sp_io,
+    traits::{GenesisBuild, UnixTime},
+};
 use frame_system::EnsureSignedBy;
 use sp_core::{crypto::UncheckedInto, H256};
 use sp_io::hashing::blake2_256;

xpallets/gateway/records/src/mock.rs

@@ -1,17 +1,18 @@
 // Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0.
 
-use frame_support::{parameter_types, sp_io};
+use frame_support::{parameter_types, sp_io, traits::GenesisBuild};
 use sp_core::H256;
 use sp_runtime::{
     testing::Header,
     traits::{BlakeTwo256, IdentityLookup},
 };
 
 use chainx_primitives::AssetId;
-pub use xp_protocol::{X_BTC, X_ETH};
 use xpallet_assets::AssetRestrictions;
 use xpallet_assets_registrar::AssetInfo;
 
+pub use xp_protocol::{X_BTC, X_ETH};
+
 use crate::{self as xpallet_gateway_records, *};
 
 /// The AccountId alias in this test module.