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

Fix fungible and fungibles set_balance return value (#13851)

Browse Source 
* Fix fungible set_balance return value

* fix fungibles set_balance return value
This commit is contained in:
Liam Aharon
2023-04-12 00:17:25 +10:00
committed by GitHub
parent 2c0993d0c0
commit 6d93d7bb7f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/src/traits/tokens/fungible/regular.rs
+2 -2
View File
@@ -327,9 +327,9 @@ pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
fn set_balance(who: &AccountId, amount: Self::Balance) -> Self::Balance { fn set_balance(who: &AccountId, amount: Self::Balance) -> Self::Balance {
let b = Self::balance(who); let b = Self::balance(who);
if b > amount { if b > amount {
Self::burn_from(who, b - amount, BestEffort, Force).map(|d| amount.saturating_sub(d)) Self::burn_from(who, b - amount, BestEffort, Force).map(|d| b.saturating_sub(d))
} else { } else {
Self::mint_into(who, amount - b).map(|d| amount.saturating_add(d)) Self::mint_into(who, amount - b).map(|d| b.saturating_add(d))
} }
.unwrap_or(b) .unwrap_or(b)
} }
substrate/frame/support/src/traits/tokens/fungibles/regular.rs
+2 -3
View File
@@ -365,10 +365,9 @@ pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
fn set_balance(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> Self::Balance { fn set_balance(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> Self::Balance {
let b = Self::balance(asset, who); let b = Self::balance(asset, who);
if b > amount { if b > amount {
Self::burn_from(asset, who, b - amount, BestEffort, Force) Self::burn_from(asset, who, b - amount, BestEffort, Force).map(|d| b.saturating_sub(d))
.map(|d| amount.saturating_sub(d))
} else { } else {
Self::mint_into(asset, who, amount - b).map(|d| amount.saturating_add(d)) Self::mint_into(asset, who, amount - b).map(|d| b.saturating_add(d))
} }
.unwrap_or(b) .unwrap_or(b)
} }