Unverified Commit 0499212f authored by Bastian Köcher's avatar Bastian Köcher Committed by GitHub
Browse files

Companion for #6576 (#1351)

* Companion for #6576

* 'Update substrate'

Co-authored-by: parity-processbot <>
parent 7afb386d
Pipeline #99512 passed with stages
in 27 minutes and 6 seconds
This diff is collapsed.
......@@ -539,10 +539,10 @@ impl<T: Trait> sp_runtime::traits::ValidateUnsigned for Module<T> {
/// otherwise free to place on chain.
#[derive(Encode, Decode, Clone, Eq, PartialEq)]
pub struct PrevalidateAttests<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>) where
<T as system::Trait>::Call: IsSubType<Module<T>, T>;
<T as system::Trait>::Call: IsSubType<Call<T>>;
impl<T: Trait + Send + Sync> Debug for PrevalidateAttests<T> where
<T as system::Trait>::Call: IsSubType<Module<T>, T>
<T as system::Trait>::Call: IsSubType<Call<T>>
{
#[cfg(feature = "std")]
fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
......@@ -556,7 +556,7 @@ impl<T: Trait + Send + Sync> Debug for PrevalidateAttests<T> where
}
impl<T: Trait + Send + Sync> PrevalidateAttests<T> where
<T as system::Trait>::Call: IsSubType<Module<T>, T>
<T as system::Trait>::Call: IsSubType<Call<T>>
{
/// Create new `SignedExtension` to check runtime version.
pub fn new() -> Self {
......@@ -565,7 +565,7 @@ impl<T: Trait + Send + Sync> PrevalidateAttests<T> where
}
impl<T: Trait + Send + Sync> SignedExtension for PrevalidateAttests<T> where
<T as system::Trait>::Call: IsSubType<Module<T>, T>
<T as system::Trait>::Call: IsSubType<Call<T>>
{
type AccountId = T::AccountId;
type Call = <T as system::Trait>::Call;
......
......@@ -1605,7 +1605,7 @@ pub enum DoubleVoteValidityError {
}
impl<T: Trait + Send + Sync> SignedExtension for ValidateDoubleVoteReports<T> where
<T as system::Trait>::Call: IsSubType<Module<T>, T>
<T as system::Trait>::Call: IsSubType<Call<T>>
{
const IDENTIFIER: &'static str = "ValidateDoubleVoteReports";
type AccountId = T::AccountId;
......
......@@ -561,10 +561,10 @@ impl<T: Trait> ActiveParas for Module<T> {
/// Ensure that parathread selections happen prioritized by fees.
#[derive(Encode, Decode, Clone, Eq, PartialEq)]
pub struct LimitParathreadCommits<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>) where
<T as system::Trait>::Call: IsSubType<Module<T>, T>;
<T as system::Trait>::Call: IsSubType<Call<T>>;
impl<T: Trait + Send + Sync> LimitParathreadCommits<T> where
<T as system::Trait>::Call: IsSubType<Module<T>, T>
<T as system::Trait>::Call: IsSubType<Call<T>>
{
/// Create a new `LimitParathreadCommits` struct.
pub fn new() -> Self {
......@@ -573,7 +573,7 @@ impl<T: Trait + Send + Sync> LimitParathreadCommits<T> where
}
impl<T: Trait + Send + Sync> sp_std::fmt::Debug for LimitParathreadCommits<T> where
<T as system::Trait>::Call: IsSubType<Module<T>, T>
<T as system::Trait>::Call: IsSubType<Call<T>>
{
fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
write!(f, "LimitParathreadCommits<T>")
......@@ -590,7 +590,7 @@ pub enum ValidityError {
}
impl<T: Trait + Send + Sync> SignedExtension for LimitParathreadCommits<T> where
<T as system::Trait>::Call: IsSubType<Module<T>, T>
<T as system::Trait>::Call: IsSubType<Call<T>>
{
const IDENTIFIER: &'static str = "LimitParathreadCommits";
type AccountId = T::AccountId;
......
......@@ -928,7 +928,7 @@ construct_runtime! {
RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage},
// Must be before session.
Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp), ValidateUnsigned},
Babe: babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
Timestamp: timestamp::{Module, Call, Storage, Inherent},
Indices: indices::{Module, Call, Storage, Config<T>, Event<T>},
......
......@@ -934,7 +934,7 @@ construct_runtime! {
Scheduler: scheduler::{Module, Call, Storage, Event<T>},
// Must be before session.
Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp), ValidateUnsigned},
Babe: babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
Timestamp: timestamp::{Module, Call, Storage, Inherent},
Indices: indices::{Module, Call, Storage, Config<T>, Event<T>},
......
......@@ -513,7 +513,7 @@ construct_runtime! {
RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage},
// Must be before session.
Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
Babe: babe::{Module, Call, Storage, Config, Inherent},
Timestamp: timestamp::{Module, Call, Storage, Inherent},
Indices: indices::{Module, Call, Storage, Config<T>, Event<T>},
......
......@@ -692,7 +692,7 @@ construct_runtime! {
RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage},
// Must be before session.
Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp), ValidateUnsigned},
Babe: babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
Timestamp: timestamp::{Module, Call, Storage, Inherent},
Indices: indices::{Module, Call, Storage, Config<T>, Event<T>},
......
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