diff --git a/substrate/core/sr-primitives/src/generic/unchecked_extrinsic.rs b/substrate/core/sr-primitives/src/generic/unchecked_extrinsic.rs index ec3801591d..d6442cbc0b 100644 --- a/substrate/core/sr-primitives/src/generic/unchecked_extrinsic.rs +++ b/substrate/core/sr-primitives/src/generic/unchecked_extrinsic.rs @@ -21,7 +21,7 @@ use std::fmt; use rstd::prelude::*; use codec::{Decode, Encode, Codec, Input, HasCompact}; -use traits::{self, Member, SimpleArithmetic, MaybeDisplay, Lookup}; +use traits::{self, Member, SimpleArithmetic, MaybeDisplay, Lookup, Extrinsic}; use super::CheckedExtrinsic; #[derive(PartialEq, Eq, Clone, Encode, Decode)] @@ -73,11 +73,6 @@ where function, } } - - /// `true` if there is a signature. - pub fn is_signed(&self) -> bool { - self.signature.is_some() - } } impl traits::Checkable @@ -113,6 +108,17 @@ where } } +impl< + Address: Codec, + Index: HasCompact + Codec, + Signature: Codec, + Call, +> Extrinsic for UncheckedExtrinsic { + fn is_signed(&self) -> Option { + Some(self.signature.is_some()) + } +} + impl Decode for UncheckedExtrinsic { diff --git a/substrate/srml/support/src/dispatch.rs b/substrate/srml/support/src/dispatch.rs index 08d73d59e4..cfcb3ae972 100644 --- a/substrate/srml/support/src/dispatch.rs +++ b/substrate/srml/support/src/dispatch.rs @@ -193,11 +193,8 @@ macro_rules! decl_module { $($rest:tt)* ) => { compile_error!("\ -First parameter of dispatch should be marked `origin` only, with no\n\ -type specified (a bit like `self`).\n\ -(For root-matching dispatches, ensure the first parameter does not use\n\ -the `T::Origin` type.)\ -") +first parameter of dispatch should be marked `origin` only, with no type specified (a bit like `self`)\n\ +(For root-matching dispatches, ensure the first parameter does not use the `T::Origin` type.)") }; (@normalize $(#[$attr:meta])* @@ -211,11 +208,8 @@ the `T::Origin` type.)\ $($rest:tt)* ) => { compile_error!("\ -First parameter of dispatch should be marked `origin` only, with no\n\ -type specified (a bit like `self`).\n\ -(For root-matching dispatches, ensure the first parameter is not named\n\ -`origin`.)\ -") +first parameter of dispatch should be marked `origin` only, with no type specified (a bit like `self`)\n\ +(For root-matching dispatches, ensure the first parameter is not named`origin`.)") }; (@normalize $(#[$attr:meta])*