pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-24 02:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[asset-conversion] nits: removed unnecessary clone (#14726)

Browse Source
This commit is contained in:
Branislav Kontur
2023-08-08 10:02:20 +02:00
committed by GitHub
parent b24b66c991
commit ab217ba8e9
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/asset-conversion/src/lib.rs
+11 -12
View File
@@ -481,22 +481,21 @@ pub mod pallet {
} else { } else {
(amount2_desired, amount1_desired, amount2_min, amount1_min) (amount2_desired, amount1_desired, amount2_min, amount1_min)
}; };
let (asset1, asset2) = pool_id.clone();
ensure!( ensure!(
amount1_desired > Zero::zero() && amount2_desired > Zero::zero(), amount1_desired > Zero::zero() && amount2_desired > Zero::zero(),
Error::<T>::WrongDesiredAmount Error::<T>::WrongDesiredAmount
); );
let maybe_pool = Pools::<T>::get(pool_id.clone()); let maybe_pool = Pools::<T>::get(&pool_id);
let pool = maybe_pool.as_ref().ok_or(Error::<T>::PoolNotFound)?; let pool = maybe_pool.as_ref().ok_or(Error::<T>::PoolNotFound)?;
let pool_account = Self::get_pool_account(&pool_id);
let (asset1, asset2) = &pool_id;
let reserve1 = Self::get_balance(&pool_account, asset1)?;
let reserve2 = Self::get_balance(&pool_account, asset2)?;
let amount1: T::AssetBalance; let amount1: T::AssetBalance;
let amount2: T::AssetBalance; let amount2: T::AssetBalance;
let pool_account = Self::get_pool_account(&pool_id);
let reserve1 = Self::get_balance(&pool_account, &asset1)?;
let reserve2 = Self::get_balance(&pool_account, &asset2)?;
if reserve1.is_zero() || reserve2.is_zero() { if reserve1.is_zero() || reserve2.is_zero() {
amount1 = amount1_desired; amount1 = amount1_desired;
amount2 = amount2_desired; amount2 = amount2_desired;
@@ -525,13 +524,13 @@ pub mod pallet {
} }
} }
Self::validate_minimal_amount(amount1.saturating_add(reserve1), &asset1) Self::validate_minimal_amount(amount1.saturating_add(reserve1), asset1)
.map_err(|_| Error::<T>::AmountOneLessThanMinimal)?; .map_err(|_| Error::<T>::AmountOneLessThanMinimal)?;
Self::validate_minimal_amount(amount2.saturating_add(reserve2), &asset2) Self::validate_minimal_amount(amount2.saturating_add(reserve2), asset2)
.map_err(|_| Error::<T>::AmountTwoLessThanMinimal)?; .map_err(|_| Error::<T>::AmountTwoLessThanMinimal)?;
Self::transfer(&asset1, &sender, &pool_account, amount1, true)?; Self::transfer(asset1, &sender, &pool_account, amount1, true)?;
Self::transfer(&asset2, &sender, &pool_account, amount2, true)?; Self::transfer(asset2, &sender, &pool_account, amount2, true)?;
let total_supply = T::PoolAssets::total_issuance(pool.lp_token.clone()); let total_supply = T::PoolAssets::total_issuance(pool.lp_token.clone());
@@ -596,7 +595,7 @@ pub mod pallet {
ensure!(lp_token_burn > Zero::zero(), Error::<T>::ZeroLiquidity); ensure!(lp_token_burn > Zero::zero(), Error::<T>::ZeroLiquidity);
let maybe_pool = Pools::<T>::get(pool_id.clone()); let maybe_pool = Pools::<T>::get(&pool_id);
let pool = maybe_pool.as_ref().ok_or(Error::<T>::PoolNotFound)?; let pool = maybe_pool.as_ref().ok_or(Error::<T>::PoolNotFound)?;
let pool_account = Self::get_pool_account(&pool_id); let pool_account = Self::get_pool_account(&pool_id);