From 9b33499a98b2545e5fd9bef45f9c649123086818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sun, 29 Jan 2023 22:37:49 +0100 Subject: [PATCH] Companion: Remove `uncles` related code (#6615) * Companion: Remove `uncles` related code https://github.com/paritytech/substrate/pull/13216 * Fix compilation * update lockfile for {"substrate"} --------- Co-authored-by: parity-processbot <> --- relay/kusama/src/lib.rs | 9 +-------- relay/polkadot/src/lib.rs | 10 +--------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 01f6ff5c9f..9b54e1666c 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -340,14 +340,8 @@ impl pallet_timestamp::Config for Runtime { type WeightInfo = weights::pallet_timestamp::WeightInfo; } -parameter_types! { - pub const UncleGenerations: u32 = 0; -} - impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex; - type UncleGenerations = UncleGenerations; - type FilterUncle = (); type EventHandler = (Staking, ImOnline); } @@ -994,7 +988,6 @@ impl InstanceFilter for ProxyType { RuntimeCall::Indices(pallet_indices::Call::freeze {..}) | // Specifically omitting Indices `transfer`, `force_transfer` // Specifically omitting the entire Balances pallet - RuntimeCall::Authorship(..) | RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Grandpa(..) | @@ -1345,7 +1338,7 @@ construct_runtime! { // Consensus support. // Authorship must be before session in order to note author in the correct session and era // for im-online and staking. - Authorship: pallet_authorship::{Pallet, Call, Storage} = 5, + Authorship: pallet_authorship::{Pallet, Storage} = 5, Staking: pallet_staking::{Pallet, Call, Storage, Config, Event} = 6, Offences: pallet_offences::{Pallet, Storage, Event} = 7, Historical: session_historical::{Pallet} = 34, diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index 7fad3de66e..d88b961e16 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -333,15 +333,8 @@ impl pallet_timestamp::Config for Runtime { type WeightInfo = weights::pallet_timestamp::WeightInfo; } -parameter_types! { - pub const UncleGenerations: u32 = 0; -} - -// TODO: substrate#2986 implement this properly impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex; - type UncleGenerations = UncleGenerations; - type FilterUncle = (); type EventHandler = (Staking, ImOnline); } @@ -1173,7 +1166,6 @@ impl InstanceFilter for ProxyType { RuntimeCall::Indices(pallet_indices::Call::freeze{..}) | // Specifically omitting Indices `transfer`, `force_transfer` // Specifically omitting the entire Balances pallet - RuntimeCall::Authorship(..) | RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Grandpa(..) | @@ -1492,7 +1484,7 @@ construct_runtime! { // Consensus support. // Authorship must be before session in order to note author in the correct session and era // for im-online and staking. - Authorship: pallet_authorship::{Pallet, Call, Storage} = 6, + Authorship: pallet_authorship::{Pallet, Storage} = 6, Staking: pallet_staking::{Pallet, Call, Storage, Config, Event} = 7, Offences: pallet_offences::{Pallet, Storage, Event} = 8, Historical: session_historical::{Pallet} = 33,