diff --git a/substrate/srml/democracy/src/lib.rs b/substrate/srml/democracy/src/lib.rs index ee110f27e9..5a1c61b8ae 100644 --- a/substrate/srml/democracy/src/lib.rs +++ b/substrate/srml/democracy/src/lib.rs @@ -25,7 +25,7 @@ use sr_primitives::weights::SimpleDispatchInfo; use codec::{Encode, Decode, Input, Output, Error}; use srml_support::{ decl_module, decl_storage, decl_event, ensure, - StorageValue, StorageMap, Parameter, Dispatchable, IsSubType, EnumerableStorageMap, + StorageValue, StorageMap, Parameter, Dispatchable, EnumerableStorageMap, traits::{ Currency, ReservableCurrency, LockableCurrency, WithdrawReason, LockIdentifier, OnFreeBalanceZero, Get @@ -182,7 +182,7 @@ pub const DEFAULT_EMERGENCY_VOTING_PERIOD: u32 = 0; pub const DEFAULT_COOLOFF_PERIOD: u32 = 0; pub trait Trait: system::Trait + Sized { - type Proposal: Parameter + Dispatchable + IsSubType, Self>; + type Proposal: Parameter + Dispatchable; type Event: From> + Into<::Event>; /// Currency type for this module. diff --git a/substrate/srml/support/src/dispatch.rs b/substrate/srml/support/src/dispatch.rs index 294fe3795e..21a2a817fb 100644 --- a/substrate/srml/support/src/dispatch.rs +++ b/substrate/srml/support/src/dispatch.rs @@ -1264,7 +1264,7 @@ macro_rules! decl_module { } pub trait IsSubType, R> { - fn is_aux_sub_type(&self) -> Option<&CallableCallFor>; + fn is_sub_type(&self) -> Option<&CallableCallFor>; } /// Implement a meta-dispatch module to dispatch to other dispatchers. @@ -1305,7 +1305,7 @@ macro_rules! impl_outer_dispatch { $( impl $crate::dispatch::IsSubType<$camelcase, $runtime> for $call_type { #[allow(unreachable_patterns)] - fn is_aux_sub_type(&self) -> Option<&$crate::dispatch::CallableCallFor<$camelcase, $runtime>> { + fn is_sub_type(&self) -> Option<&$crate::dispatch::CallableCallFor<$camelcase, $runtime>> { match *self { $call_type::$camelcase(ref r) => Some(r), // May be unreachable