From f3e474ecfe28b6f3a04408c2c5baf3706f21091b Mon Sep 17 00:00:00 2001 From: Gemma Date: Mon, 2 Sep 2024 21:31:04 +0800 Subject: [PATCH] Remove getters in cross-in-out --- pallets/cross-in-out/src/lib.rs | 22 ++++++++-------------- pallets/cross-in-out/src/tests.rs | 12 ++++++------ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pallets/cross-in-out/src/lib.rs b/pallets/cross-in-out/src/lib.rs index 5f1841e6cc..9cf42a272e 100644 --- a/pallets/cross-in-out/src/lib.rs +++ b/pallets/cross-in-out/src/lib.rs @@ -144,24 +144,20 @@ pub mod pallet { /// To store currencies that support indirect cross-in and cross-out. #[pallet::storage] - #[pallet::getter(fn get_cross_currency_registry)] pub type CrossCurrencyRegistry = StorageMap<_, Blake2_128Concat, CurrencyId, ()>; /// Accounts in the whitelist can issue the corresponding Currency. #[pallet::storage] - #[pallet::getter(fn get_issue_whitelist)] pub type IssueWhiteList = StorageMap<_, Blake2_128Concat, CurrencyId, BoundedVec, T::MaxLengthLimit>>; /// Accounts in the whitelist can register the mapping between a multilocation and an accountId. #[pallet::storage] - #[pallet::getter(fn get_register_whitelist)] pub type RegisterWhiteList = StorageMap<_, Blake2_128Concat, CurrencyId, Vec>>; /// Mapping a Bifrost account to a multilocation of a outer chain #[pallet::storage] - #[pallet::getter(fn account_to_outer_multilocation)] pub type AccountToOuterMultilocation = StorageDoubleMap< _, Blake2_128Concat, @@ -174,7 +170,6 @@ pub mod pallet { /// Mapping a multilocation of a outer chain to a Bifrost account #[pallet::storage] - #[pallet::getter(fn outer_multilocation_to_account)] pub type OuterMultilocationToAccount = StorageDoubleMap< _, Blake2_128Concat, @@ -187,7 +182,6 @@ pub mod pallet { /// minimum crossin and crossout amount【crossinMinimum, crossoutMinimum】 #[pallet::storage] - #[pallet::getter(fn get_crossing_minimum_amount)] pub type CrossingMinimumAmount = StorageMap<_, Blake2_128Concat, CurrencyId, (BalanceOf, BalanceOf)>; @@ -217,12 +211,12 @@ pub mod pallet { Error::::CurrencyNotSupportCrossInAndOut ); - let crossing_minimum_amount = Self::get_crossing_minimum_amount(currency_id) + let crossing_minimum_amount = CrossingMinimumAmount::::get(currency_id) .ok_or(Error::::NoCrossingMinimumSet)?; ensure!(amount >= crossing_minimum_amount.0, Error::::AmountLowerThanMinimum); let issue_whitelist = - Self::get_issue_whitelist(currency_id).ok_or(Error::::NotAllowed)?; + IssueWhiteList::::get(currency_id).ok_or(Error::::NotAllowed)?; ensure!(issue_whitelist.contains(&issuer), Error::::NotAllowed); let entrance_account_mutlilcaition = Box::new(MultiLocation { @@ -237,7 +231,7 @@ pub mod pallet { let dest = if entrance_account_mutlilcaition == location { T::EntrancePalletId::get().into_account_truncating() } else { - Self::outer_multilocation_to_account(currency_id, location.clone()) + OuterMultilocationToAccount::::get(currency_id, location.clone()) .ok_or(Error::::NoAccountIdMapping)? }; @@ -268,7 +262,7 @@ pub mod pallet { Error::::CurrencyNotSupportCrossInAndOut ); - let crossing_minimum_amount = Self::get_crossing_minimum_amount(currency_id) + let crossing_minimum_amount = CrossingMinimumAmount::::get(currency_id) .ok_or(Error::::NoCrossingMinimumSet)?; ensure!(amount >= crossing_minimum_amount.1, Error::::AmountLowerThanMinimum); @@ -296,7 +290,7 @@ pub mod pallet { let registerer = ensure_signed(origin)?; let register_whitelist = - Self::get_register_whitelist(currency_id).ok_or(Error::::NotAllowed)?; + RegisterWhiteList::::get(currency_id).ok_or(Error::::NotAllowed)?; ensure!(register_whitelist.contains(®isterer), Error::::NotAllowed); ensure!( @@ -346,7 +340,7 @@ pub mod pallet { ); let original_location = - Self::account_to_outer_multilocation(currency_id, account.clone()) + AccountToOuterMultilocation::::get(currency_id, account.clone()) .ok_or(Error::::NotExist)?; ensure!(original_location != *foreign_location.clone(), Error::::AlreadyExist); @@ -413,7 +407,7 @@ pub mod pallet { ) -> DispatchResult { T::ControlOrigin::ensure_origin(origin)?; - let rs = Self::get_issue_whitelist(currency_id); + let rs = IssueWhiteList::::get(currency_id); let mut issue_whitelist; if let Some(bounded_vec) = rs { issue_whitelist = bounded_vec.to_vec(); @@ -471,7 +465,7 @@ pub mod pallet { T::ControlOrigin::ensure_origin(origin)?; let empty_vec: Vec> = Vec::new(); - if Self::get_register_whitelist(currency_id) == None { + if RegisterWhiteList::::get(currency_id) == None { RegisterWhiteList::::insert(currency_id, empty_vec); } diff --git a/pallets/cross-in-out/src/tests.rs b/pallets/cross-in-out/src/tests.rs index 77ee7d7065..0e60781cbe 100644 --- a/pallets/cross-in-out/src/tests.rs +++ b/pallets/cross-in-out/src/tests.rs @@ -119,11 +119,11 @@ fn cross_in_and_cross_out_should_work() { #[test] fn add_to_and_remove_from_issue_whitelist_should_work() { ExtBuilder::default().one_hundred_for_alice_n_bob().build().execute_with(|| { - assert_eq!(CrossInOut::get_issue_whitelist(KSM), None); + assert_eq!(IssueWhiteList::::get(KSM), None); assert_ok!(CrossInOut::add_to_issue_whitelist(RuntimeOrigin::signed(ALICE), KSM, ALICE)); let bounded_vector = BoundedVec::try_from(vec![ALICE]).unwrap(); - assert_eq!(CrossInOut::get_issue_whitelist(KSM), Some(bounded_vector)); + assert_eq!(IssueWhiteList::::get(KSM), Some(bounded_vector)); assert_noop!( CrossInOut::remove_from_issue_whitelist(RuntimeOrigin::signed(ALICE), KSM, BOB), @@ -136,17 +136,17 @@ fn add_to_and_remove_from_issue_whitelist_should_work() { ALICE )); let empty_vec = BoundedVec::default(); - assert_eq!(CrossInOut::get_issue_whitelist(KSM), Some(empty_vec)); + assert_eq!(IssueWhiteList::::get(KSM), Some(empty_vec)); }); } #[test] fn add_to_and_remove_from_register_whitelist_should_work() { ExtBuilder::default().one_hundred_for_alice_n_bob().build().execute_with(|| { - assert_eq!(CrossInOut::get_register_whitelist(KSM), None); + assert_eq!(RegisterWhiteList::::get(KSM), None); assert_ok!(CrossInOut::add_to_register_whitelist(RuntimeOrigin::signed(ALICE), KSM, ALICE)); - assert_eq!(CrossInOut::get_register_whitelist(KSM), Some(vec![ALICE])); + assert_eq!(RegisterWhiteList::::get(KSM), Some(vec![ALICE])); assert_noop!( CrossInOut::remove_from_register_whitelist(RuntimeOrigin::signed(ALICE), KSM, BOB), @@ -158,7 +158,7 @@ fn add_to_and_remove_from_register_whitelist_should_work() { KSM, ALICE )); - assert_eq!(CrossInOut::get_register_whitelist(KSM), Some(vec![])); + assert_eq!(RegisterWhiteList::::get(KSM), Some(vec![])); }); }