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

pallet-assets: Rename total_supply to amount (#13229)

Browse Source 
* pallet-assets: Rename `total_supply` to `amount`

We are actually passing the `amount` on assets being minted and not the total supply.

Closes: https://github.com/paritytech/substrate/issues/13210

* ".git/.scripts/commands/fmt/fmt.sh"

* Fix compilation

* FMT

Co-authored-by: command-bot <>
This commit is contained in:
Bastian Köcher
2023-01-25 12:57:01 +01:00
committed by GitHub
parent d4652aa2bf
commit fcc1994977
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/assets/src/benchmarking.rs
+1 -1
View File
@@ -220,7 +220,7 @@ benchmarks_instance_pallet! {
let amount = T::Balance::from(100u32);
}: _(SystemOrigin::Signed(caller.clone()), asset_id, caller_lookup, amount)
verify {
assert_last_event::<T, I>(Event::Issued { asset_id: asset_id.into(), owner: caller, total_supply: amount }.into());
assert_last_event::<T, I>(Event::Issued { asset_id: asset_id.into(), owner: caller, amount }.into());
}
burn {
substrate/frame/assets/src/functions.rs
+6 -9
View File
@@ -354,18 +354,15 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
if let Some(check_issuer) = maybe_check_issuer {
ensure!(check_issuer == details.issuer, Error::<T, I>::NoPermission);
}
debug_assert!(
T::Balance::max_value() - details.supply >= amount,
"checked in prep; qed"
);
debug_assert!(details.supply.checked_add(&amount).is_some(), "checked in prep; qed");
details.supply = details.supply.saturating_add(amount);
Ok(())
})?;
Self::deposit_event(Event::Issued {
asset_id: id,
owner: beneficiary.clone(),
total_supply: amount,
});
Self::deposit_event(Event::Issued { asset_id: id, owner: beneficiary.clone(), amount });
Ok(())
}
substrate/frame/assets/src/lib.rs
+3 -5
View File
@@ -151,9 +151,7 @@ pub use types::*;
use scale_info::TypeInfo;
use sp_runtime::{
traits::{
AtLeast32BitUnsigned, Bounded, CheckedAdd, CheckedSub, Saturating, StaticLookup, Zero,
},
traits::{AtLeast32BitUnsigned, CheckedAdd, CheckedSub, Saturating, StaticLookup, Zero},
ArithmeticError, TokenError,
};
use sp_std::{borrow::Borrow, prelude::*};
@@ -427,7 +425,7 @@ pub mod pallet {
*amount,
|details| -> DispatchResult {
debug_assert!(
T::Balance::max_value() - details.supply >= *amount,
details.supply.checked_add(&amount).is_some(),
"checked in prep; qed"
);
details.supply = details.supply.saturating_add(*amount);
@@ -445,7 +443,7 @@ pub mod pallet {
/// Some asset class was created.
Created { asset_id: T::AssetId, creator: T::AccountId, owner: T::AccountId },
/// Some assets were issued.
Issued { asset_id: T::AssetId, owner: T::AccountId, total_supply: T::Balance },
Issued { asset_id: T::AssetId, owner: T::AccountId, amount: T::Balance },
/// Some assets were transferred.
Transferred {
asset_id: T::AssetId,