xtokens consume rate-limiter by CurrencyId

Author: wangjj9219

xtokens/src/lib.rs

@@ -144,7 +144,8 @@ pub mod module {
 		type CurrencyId: Parameter + Member + Clone;
 
 		/// Convert `T::CurrencyId` to `Location`.
-		type CurrencyIdConvert: Convert<Self::CurrencyId, Option<Location>>;
+		type CurrencyIdConvert: Convert<Self::CurrencyId, Option<Location>>
+			+ Convert<Location, Option<Self::CurrencyId>>;
 
 		/// Convert `T::AccountId` to `Location`.
 		type AccountIdToLocation: Convert<Self::AccountId, Location>;
@@ -468,25 +469,27 @@ pub mod module {
 			for i in 0..asset_len {
 				let asset = assets.get(i).ok_or(Error::<T>::AssetIndexNonExistent)?;
 
-				// per asset check
-				let amount = match asset.fun {
-					Fungibility::Fungible(amount) => amount,
-					Fungibility::NonFungible(_) => 1,
-				};
-
-				// try consume quota of the rate limiter.
-				// NOTE: use AssetId as the key, use AccountId as whitelist filter key.
-				match T::RateLimiter::try_consume(rate_limiter_id, asset.id.clone(), amount, Some(who)) {
-					Ok(_) => {}
-					Err(_e @ RateLimiterError::Deny) => {
-						return Err(Error::<T>::RateLimiterDeny.into());
-					}
-					Err(ref _e @ RateLimiterError::Delay { duration }) => {
-						if duration > need_delay.unwrap_or_default() {
-							need_delay = Some(duration);
+				if let Some(currency_id) = T::CurrencyIdConvert::convert(asset.id.0.clone()) {
+					// per asset check
+					let amount = match asset.fun {
+						Fungibility::Fungible(amount) => amount,
+						Fungibility::NonFungible(_) => 1,
+					};
+
+					// try consume quota of the rate limiter.
+					// NOTE: use CurrencyId as the key, use AccountId as whitelist filter key.
+					match T::RateLimiter::try_consume(rate_limiter_id, currency_id, amount, Some(who)) {
+						Ok(_) => {}
+						Err(_e @ RateLimiterError::Deny) => {
+							return Err(Error::<T>::RateLimiterDeny.into());
 						}
-					}
-				};
+						Err(ref _e @ RateLimiterError::Delay { duration }) => {
+							if duration > need_delay.unwrap_or_default() {
+								need_delay = Some(duration);
+							}
+						}
+					};
+				}
 			}
 
 			Ok(need_delay)

xtokens/src/mock/para.rs

@@ -248,11 +248,9 @@ impl RateLimiter<BlockNumberFor<Runtime>> for MockRateLimiter {
 		value: u128,
 	) -> Result<(), RateLimiterError<BlockNumberFor<Runtime>>> {
 		let encoded_limit_key = limit_key.encode();
-		let r_multi_location: Location = CurrencyIdConvert::convert(CurrencyId::R).unwrap();
-		let r_asset_id = AssetId(r_multi_location);
-		let encoded_r_asset_id = r_asset_id.encode();
+		let encoded_currency_id = CurrencyId::R.encode();
 
-		if encoded_limit_key == encoded_r_asset_id {
+		if encoded_limit_key == encoded_currency_id {
 			let accumulation = R_ACCUMULATION.with(|v| *v.borrow());
 			ensure!((accumulation + value) <= 2000, RateLimiterError::Deny);
 		}
@@ -262,11 +260,9 @@ impl RateLimiter<BlockNumberFor<Runtime>> for MockRateLimiter {
 
 	fn consume(_: Self::RateLimiterId, limit_key: impl Encode, value: u128) {
 		let encoded_limit_key = limit_key.encode();
-		let r_multi_location: Location = CurrencyIdConvert::convert(CurrencyId::R).unwrap();
-		let r_asset_id = AssetId(r_multi_location);
-		let encoded_r_asset_id = r_asset_id.encode();
+		let encoded_currency_id = CurrencyId::R.encode();
 
-		if encoded_limit_key == encoded_r_asset_id {
+		if encoded_limit_key == encoded_currency_id {
 			R_ACCUMULATION.with(|v| *v.borrow_mut() += value);
 		}
 	}