pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-09 20:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded cruft (#3368)

Browse Source
This commit is contained in:
Gavin Wood
2019-08-12 15:47:29 +02:00
committed by GitHub
parent 418ea85e42
commit 09b57261df
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/democracy/src/lib.rs
+2 -2
View File
@@ -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<Origin=Self::Origin> + IsSubType<Module<Self>, Self>;
type Proposal: Parameter + Dispatchable<Origin=Self::Origin>;
type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
/// Currency type for this module.
substrate/srml/support/src/dispatch.rs
+2 -2
View File
@@ -1264,7 +1264,7 @@ macro_rules! decl_module {
}
pub trait IsSubType<T: Callable<R>, R> {
fn is_aux_sub_type(&self) -> Option<&CallableCallFor<T, R>>;
fn is_sub_type(&self) -> Option<&CallableCallFor<T, R>>;
}
/// 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