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

Companion for #7936: Migrate pallet-balances to pallet attribute macro (#2331)

Browse Source 
* Fix up balances Events

* "Update Substrate"

* Update substrate

Co-authored-by: parity-processbot <>
This commit is contained in:
Andrew Jones
2021-02-10 13:50:51 +00:00
committed by GitHub
parent d20c2ae369
commit 50d1522a49
2 changed files with 142 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+139 -139
View File
File diff suppressed because it is too large Load Diff
polkadot/runtime/common/src/impls.rs
+3 -11
View File
@@ -26,17 +26,13 @@ where
R: pallet_balances::Config + pallet_authorship::Config, R: pallet_balances::Config + pallet_authorship::Config,
<R as frame_system::Config>::AccountId: From<primitives::v1::AccountId>, <R as frame_system::Config>::AccountId: From<primitives::v1::AccountId>,
<R as frame_system::Config>::AccountId: Into<primitives::v1::AccountId>, <R as frame_system::Config>::AccountId: Into<primitives::v1::AccountId>,
<R as frame_system::Config>::Event: From<pallet_balances::RawEvent< <R as frame_system::Config>::Event: From<pallet_balances::Event<R>>,
<R as frame_system::Config>::AccountId,
<R as pallet_balances::Config>::Balance,
pallet_balances::DefaultInstance>
>,
{ {
fn on_nonzero_unbalanced(amount: NegativeImbalance<R>) { fn on_nonzero_unbalanced(amount: NegativeImbalance<R>) {
let numeric_amount = amount.peek(); let numeric_amount = amount.peek();
let author = <pallet_authorship::Module<R>>::author(); let author = <pallet_authorship::Module<R>>::author();
<pallet_balances::Module<R>>::resolve_creating(&<pallet_authorship::Module<R>>::author(), amount); <pallet_balances::Module<R>>::resolve_creating(&<pallet_authorship::Module<R>>::author(), amount);
<frame_system::Module<R>>::deposit_event(pallet_balances::RawEvent::Deposit(author, numeric_amount)); <frame_system::Module<R>>::deposit_event(pallet_balances::Event::Deposit(author, numeric_amount));
} }
} }
@@ -47,11 +43,7 @@ where
pallet_treasury::Module<R>: OnUnbalanced<NegativeImbalance<R>>, pallet_treasury::Module<R>: OnUnbalanced<NegativeImbalance<R>>,
<R as frame_system::Config>::AccountId: From<primitives::v1::AccountId>, <R as frame_system::Config>::AccountId: From<primitives::v1::AccountId>,
<R as frame_system::Config>::AccountId: Into<primitives::v1::AccountId>, <R as frame_system::Config>::AccountId: Into<primitives::v1::AccountId>,
<R as frame_system::Config>::Event: From<pallet_balances::RawEvent< <R as frame_system::Config>::Event: From<pallet_balances::Event<R>>,
<R as frame_system::Config>::AccountId,
<R as pallet_balances::Config>::Balance,
pallet_balances::DefaultInstance>
>,
{ {
fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item=NegativeImbalance<R>>) { fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item=NegativeImbalance<R>>) {
if let Some(fees) = fees_then_tips.next() { if let Some(fees) = fees_then_tips.next() {