mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 11:41:02 +00:00
Companion for primitives consolidation into v2 (#1071)
* branches * update all primitives references * fmt * Update Polkadot & Substrate * Again Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
committed by
GitHub
parent
40bd56db82
commit
8eee3c37c4
@@ -40,7 +40,7 @@ impl<R> OnUnbalanced<NegativeImbalance<R>> for ToStakingPot<R>
|
||||
where
|
||||
R: pallet_balances::Config + pallet_collator_selection::Config,
|
||||
AccountIdOf<R>:
|
||||
From<polkadot_primitives::v1::AccountId> + Into<polkadot_primitives::v1::AccountId>,
|
||||
From<polkadot_primitives::v2::AccountId> + Into<polkadot_primitives::v2::AccountId>,
|
||||
<R as frame_system::Config>::Event: From<pallet_balances::Event<R>>,
|
||||
{
|
||||
fn on_nonzero_unbalanced(amount: NegativeImbalance<R>) {
|
||||
@@ -56,7 +56,7 @@ impl<R> OnUnbalanced<NegativeImbalance<R>> for DealWithFees<R>
|
||||
where
|
||||
R: pallet_balances::Config + pallet_collator_selection::Config,
|
||||
AccountIdOf<R>:
|
||||
From<polkadot_primitives::v1::AccountId> + Into<polkadot_primitives::v1::AccountId>,
|
||||
From<polkadot_primitives::v2::AccountId> + Into<polkadot_primitives::v2::AccountId>,
|
||||
<R as frame_system::Config>::Event: From<pallet_balances::Event<R>>,
|
||||
{
|
||||
fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance<R>>) {
|
||||
@@ -76,7 +76,7 @@ impl<R> HandleCredit<AccountIdOf<R>, pallet_assets::Pallet<R>> for AssetsToBlock
|
||||
where
|
||||
R: pallet_authorship::Config + pallet_assets::Config,
|
||||
AccountIdOf<R>:
|
||||
From<polkadot_primitives::v1::AccountId> + Into<polkadot_primitives::v1::AccountId>,
|
||||
From<polkadot_primitives::v2::AccountId> + Into<polkadot_primitives::v2::AccountId>,
|
||||
{
|
||||
fn handle_credit(credit: CreditOf<AccountIdOf<R>, pallet_assets::Pallet<R>>) {
|
||||
if let Some(author) = pallet_authorship::Pallet::<R>::author() {
|
||||
@@ -119,7 +119,7 @@ mod tests {
|
||||
};
|
||||
use frame_system::{limits, EnsureRoot};
|
||||
use pallet_collator_selection::IdentityCollator;
|
||||
use polkadot_primitives::v1::AccountId;
|
||||
use polkadot_primitives::v2::AccountId;
|
||||
use sp_core::H256;
|
||||
use sp_runtime::{
|
||||
testing::Header,
|
||||
|
||||
Reference in New Issue
Block a user