Unverified Commit 664c6eca authored by Qinxuan Chen's avatar Qinxuan Chen Committed by GitHub
Browse files

Companion for substrate#9197 (#3359)



* Companion for substrate#9197

Signed-off-by: default avatarkoushiro <koushiro.cqx@gmail.com>

* update Substrate

Co-authored-by: Shawn Tabrizi's avatarShawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: parity-processbot <>
parent a08a663e
Pipeline #147081 passed with stages
in 40 minutes and 1 second
This diff is collapsed.
...@@ -40,7 +40,7 @@ pub struct DealWithFees<R>(sp_std::marker::PhantomData<R>); ...@@ -40,7 +40,7 @@ pub struct DealWithFees<R>(sp_std::marker::PhantomData<R>);
impl<R> OnUnbalanced<NegativeImbalance<R>> for DealWithFees<R> impl<R> OnUnbalanced<NegativeImbalance<R>> for DealWithFees<R>
where where
R: pallet_balances::Config + pallet_treasury::Config + pallet_authorship::Config, R: pallet_balances::Config + pallet_treasury::Config + pallet_authorship::Config,
pallet_treasury::Module<R>: OnUnbalanced<NegativeImbalance<R>>, pallet_treasury::Pallet<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::Event<R>>, <R as frame_system::Config>::Event: From<pallet_balances::Event<R>>,
...@@ -53,7 +53,7 @@ where ...@@ -53,7 +53,7 @@ where
// for tips, if any, 100% to author // for tips, if any, 100% to author
tips.merge_into(&mut split.1); tips.merge_into(&mut split.1);
} }
use pallet_treasury::Module as Treasury; use pallet_treasury::Pallet as Treasury;
<Treasury<R> as OnUnbalanced<_>>::on_unbalanced(split.0); <Treasury<R> as OnUnbalanced<_>>::on_unbalanced(split.0);
<ToAuthor<R> as OnUnbalanced<_>>::on_unbalanced(split.1); <ToAuthor<R> as OnUnbalanced<_>>::on_unbalanced(split.1);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment