From d0bacd048b7cb8bf82d0ed8c00f746c2faa7a8b9 Mon Sep 17 00:00:00 2001 From: Frank Yin Date: Mon, 3 Jan 2022 23:47:55 -0800 Subject: [PATCH] Revert "simulate exchange rate (#1742)" (#1746) This reverts commit cbb484be65c7a347279e56c4b89a326f41e1bc9e. --- runtime/mandala/src/lib.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index d675306ca7..9079268ba7 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -52,7 +52,7 @@ use module_currencies::{BasicCurrencyAdapter, Currency}; use module_evm::{CallInfo, CreateInfo, EvmTask, Runner}; use module_evm_accounts::EvmAddressMapping; use module_relaychain::RelayChainCallBuilder; -use module_support::{AssetIdMapping, DispatchableTask}; +use module_support::{AssetIdMapping, DispatchableTask, ExchangeRateProvider}; use module_transaction_payment::{Multiplier, TargetedFeeAdjustment, TransactionFeePoolTrader}; use scale_info::TypeInfo; @@ -1846,21 +1846,17 @@ impl orml_tokens::ConvertBalance for ConvertBalanceHoma { type AssetId = CurrencyId; fn convert_balance(balance: Balance, asset_id: CurrencyId) -> Balance { - let current_block = System::block_number(); - let exchange_rate = - ExchangeRate::checked_from_rational(current_block, 3_000_000u128).unwrap_or_else(DefaultExchangeRate::get); match asset_id { - CurrencyId::Token(TokenSymbol::LKSM) => exchange_rate.checked_mul_int(balance).unwrap_or_default(), + CurrencyId::Token(TokenSymbol::LKSM) => { + Homa::get_exchange_rate().checked_mul_int(balance).unwrap_or_default() + } _ => balance, } } fn convert_balance_back(balance: Balance, asset_id: CurrencyId) -> Balance { - let current_block = System::block_number(); - let exchange_rate = - ExchangeRate::checked_from_rational(current_block, 3_000_000u128).unwrap_or_else(DefaultExchangeRate::get); match asset_id { - CurrencyId::Token(TokenSymbol::LKSM) => exchange_rate + CurrencyId::Token(TokenSymbol::LKSM) => Homa::get_exchange_rate() .reciprocal() .unwrap_or_default() .checked_mul_int(balance)