node-runtime checks

core/sr-primitives/src/generic/unchecked_extrinsic.rs

@@ -84,7 +84,7 @@ where
 	Call: Encode + Member,
 	Signature: Member + traits::Verify<Signer=AccountId> + Codec,
 	AccountId: Member + MaybeDisplay,
-	Context: Lookup<Source=Address, Target=AccountId, Error=Error>,
+	Context: Lookup<Source=Address, Target=AccountId, Error=&'static str>
 {
 	type Checked = CheckedExtrinsic<AccountId, Index, Call>;
 	type Error = Error;
@@ -93,7 +93,7 @@ where
 		Ok(match self.signature {
 			Some(SignatureContent{signed, signature, index}) => {
 				let payload = (index, self.function);
-				let signed = context.lookup(signed)?;
+				let signed = context.lookup(signed).map_err(Into::into)?;
 				if !crate::verify_encoded_lazy(&signature, &payload, &signed) {
 					return Err(Error::BadSignature)
 				}

core/sr-primitives/src/generic/unchecked_mortal_compact_extrinsic.rs

@@ -76,7 +76,7 @@ where
 	AccountId: Member + MaybeDisplay,
 	BlockNumber: SimpleArithmetic,
 	Hash: Encode,
-	Context: Lookup<Source=Address, Target=AccountId, Error=Error>
+	Context: Lookup<Source=Address, Target=AccountId, Error=&'static str>
 		+ CurrentHeight<BlockNumber=BlockNumber>
 		+ BlockNumberToHash<BlockNumber=BlockNumber, Hash=Hash>,
 {
@@ -89,7 +89,7 @@ where
 				let current_u64 = context.current_height().saturated_into::<u64>();
 				let h = context.block_number_to_hash(era.birth(current_u64).saturated_into())
 					.ok_or(Error::Unknown("transaction birth block ancient"))?;
-				let signed = context.lookup(signed)?;
+				let signed = context.lookup(signed).map_err(Into::into)?;
 				let raw_payload = (index, self.function, era, h);
 				if !raw_payload.using_encoded(|payload| {
 					if payload.len() > 256 {

core/sr-primitives/src/generic/unchecked_mortal_extrinsic.rs

@@ -77,7 +77,7 @@ where
 	AccountId: Member + MaybeDisplay,
 	BlockNumber: SimpleArithmetic,
 	Hash: Encode,
-	Context: Lookup<Source=Address, Target=AccountId, Error=Error>
+	Context: Lookup<Source=Address, Target=AccountId, Error=&'static str>
 		+ CurrentHeight<BlockNumber=BlockNumber>
 		+ BlockNumberToHash<BlockNumber=BlockNumber, Hash=Hash>,
 {
@@ -90,7 +90,7 @@ where
 				let current_u64 = context.current_height().saturated_into::<u64>();
 				let h = context.block_number_to_hash(era.birth(current_u64).saturated_into())
 					.ok_or(Error::Unknown("transaction birth block ancient"))?;
-				let signed = context.lookup(signed)?;
+				let signed = context.lookup(signed).map_err(Into::into)?;
 				let raw_payload = (index, self.function, era, h);
 
 				if !raw_payload.using_encoded(|payload| {

core/sr-primitives/src/lib.rs

@@ -77,6 +77,12 @@ impl From<Error> for &str {
 	}
 }
 
+impl Into<Error> for &'static str {
+	fn into(self) -> Error {
+		Error::Unknown(self)
+	}
+}
+
 /// Justification type.
 pub type Justification = Vec<u8>;
 

node/runtime/src/lib.rs

@@ -96,6 +96,7 @@ impl system::Trait for Runtime {
 	type Lookup = Indices;
 	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	type Event = Event;
+	type Error = Error;
 }
 
 impl aura::Trait for Runtime {

srml/council/src/motions.rs

@@ -18,7 +18,7 @@
 
 use rstd::{prelude::*, result};
 use substrate_primitives::u32_trait::Value as U32;
-use primitives::traits::{Hash, EnsureOrigin, EnsureOriginError};
+use primitives::traits::{Hash, EnsureOrigin};
 use srml_support::{
 	dispatch::{Dispatchable, Parameter}, codec::{Encode, Decode},
 	StorageValue, StorageMap, decl_module, decl_event, decl_storage, ensure
@@ -259,11 +259,11 @@ pub fn ensure_council_members<OuterOrigin, AccountId>(o: OuterOrigin, n: MemberC
 
 pub struct EnsureMember<AccountId>(::rstd::marker::PhantomData<AccountId>);
 impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>> + EnsureOriginError,
+	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
 	AccountId
 > EnsureOrigin<O> for EnsureMember<AccountId> {
 	type Success = AccountId;
-	type Error = O;
+	type Error = &'static str;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
 			RawOrigin::Member(id) => Ok(id),
@@ -274,12 +274,12 @@ impl<
 
 pub struct EnsureMembers<N: U32, AccountId>(::rstd::marker::PhantomData<(N, AccountId)>);
 impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>> + EnsureOriginError,
+	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
 	N: U32,
 	AccountId,
 > EnsureOrigin<O> for EnsureMembers<N, AccountId> {
 	type Success = (MemberCount, MemberCount);
-	type Error = O;
+	type Error = &'static str;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
 			RawOrigin::Members(n, m) if n >= N::VALUE => Ok((n, m)),
@@ -292,13 +292,13 @@ pub struct EnsureProportionMoreThan<N: U32, D: U32, AccountId>(
 	::rstd::marker::PhantomData<(N, D, AccountId)>
 );
 impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>> + EnsureOriginError,
+	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
 	N: U32,
 	D: U32,
 	AccountId,
 > EnsureOrigin<O> for EnsureProportionMoreThan<N, D, AccountId> {
 	type Success = ();
-	type Error = O;
+	type Error = &'static str;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
 			RawOrigin::Members(n, m) if n * D::VALUE > N::VALUE * m => Ok(()),
@@ -311,13 +311,13 @@ pub struct EnsureProportionAtLeast<N: U32, D: U32, AccountId>(
 	::rstd::marker::PhantomData<(N, D, AccountId)>
 );
 impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>> + EnsureOriginError,
+	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
 	N: U32,
 	D: U32,
 	AccountId,
 > EnsureOrigin<O> for EnsureProportionAtLeast<N, D, AccountId> {
 	type Success = ();
-	type Error = O;
+	type Error = &'static str;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
 			RawOrigin::Members(n, m) if n * D::VALUE >= N::VALUE * m => Ok(()),

srml/executive/src/lib.rs

@@ -78,7 +78,7 @@ use rstd::prelude::*;
 use rstd::marker::PhantomData;
 use rstd::convert::TryInto;
 use primitives::{
-	generic::Digest, ApplyResult, ApplyError, DispatchError,
+	generic::Digest, ApplyResult, ApplyError, DispatchError, Error as PrimitiveError,
 	traits::{
 		self, Header, Zero, One, Checkable, Applyable, CheckEqual, OnFinalize,
 		OnInitialize, NumberFor, Block as BlockT, OffchainWorker,
@@ -116,10 +116,11 @@ impl<
 	Payment: MakePayment<System::AccountId>,
 	UnsignedValidator,
 	AllModules: OnInitialize<System::BlockNumber> + OnFinalize<System::BlockNumber> + OffchainWorker<System::BlockNumber>,
+	CheckableError: Into<PrimitiveError>,
 	Error: Into<DispatchError> + TryInto<system::Error>,
 > ExecuteBlock<Block> for Executive<System, Block, Context, Payment, UnsignedValidator, AllModules>
 where
-	Block::Extrinsic: Checkable<Context, Error=Error> + Codec,
+	Block::Extrinsic: Checkable<Context, Error=CheckableError> + Codec,
 	CheckedOf<Block::Extrinsic, Context>: Applyable<Index=System::Index, AccountId=System::AccountId> + Weighable,
 	CallOf<Block::Extrinsic, Context>: Dispatchable<Error=Error>,
 	OriginOf<Block::Extrinsic, Context>: From<Option<System::AccountId>>,
@@ -137,10 +138,11 @@ impl<
 	Payment: MakePayment<System::AccountId>,
 	UnsignedValidator,
 	AllModules: OnInitialize<System::BlockNumber> + OnFinalize<System::BlockNumber> + OffchainWorker<System::BlockNumber>,
+	CheckableError: Into<PrimitiveError>,
 	Error: Into<DispatchError> + TryInto<system::Error>,
 > Executive<System, Block, Context, Payment, UnsignedValidator, AllModules>
 where
-	Block::Extrinsic: Checkable<Context, Error=Error> + Codec,
+	Block::Extrinsic: Checkable<Context, Error=CheckableError> + Codec,
 	CheckedOf<Block::Extrinsic, Context>: Applyable<Index=System::Index, AccountId=System::AccountId> + Weighable,
 	CallOf<Block::Extrinsic, Context>: Dispatchable<Error=Error>,
 	OriginOf<Block::Extrinsic, Context>: From<Option<System::AccountId>>,
@@ -343,14 +345,14 @@ where
 			// Checks out. Carry on.
 			Ok(xt) => xt,
 			Err(err) => {
-				match err.try_into() {
+				match err.into() {
 					// An unknown account index implies that the transaction may yet become valid.
 					// TODO: avoid hardcoded error string here
-					Ok(system::Error::Unknown("invalid account index")) =>
+					PrimitiveError::Unknown("invalid account index") =>
 						return TransactionValidity::Unknown(INVALID_INDEX),
 					// Technically a bad signature could also imply an out-of-date account index, but
 					// that's more of an edge case.
-					Ok(system::Error::BadSignature) =>
+					PrimitiveError::BadSignature =>
 						return TransactionValidity::Invalid(ApplyError::BadSignature as i8),
 					_ => return TransactionValidity::Invalid(UNKNOWN_ERROR),
 				}

srml/support/src/dispatch.rs

@@ -1270,7 +1270,7 @@ macro_rules! impl_outer_dispatch {
 			type Error = $error_type;
 			fn dispatch(self, origin: $origin) -> $crate::dispatch::DispatchResult<Self::Error> {
 				match self {
-					$( $call_type::$camelcase(call) => call.dispatch(origin), )*
+					$( $call_type::$camelcase(call) => call.dispatch(origin).map_err(Into::into), )*
 				}
 			}
 		}

srml/support/src/error.rs

@@ -76,6 +76,12 @@ macro_rules! impl_outer_error {
 			}
 		}
 
+		impl From<&'static str> for $name {
+			fn from(err: &'static str) -> Self {
+				$name::system($system::Error::Unknown(err))
+			}
+		}
+
 		impl $crate::rstd::convert::TryInto<$system::Error> for $name {
 			type Error = Self;
 			fn try_into(self) -> $crate::dispatch::result::Result<$system::Error, Self::Error> {
@@ -95,11 +101,11 @@ macro_rules! impl_outer_error {
 							$crate::runtime_primitives::DispatchError {
 								module: 0,
 								error: 0,
-								message: msg,
+								message: Some(msg),
 							},
 						_ => $crate::runtime_primitives::DispatchError {
 								module: 0,
-								error: err.into(),
+								error: Into::<u8>::into(err) as i8,
 								message: None,
 							},
 					},
@@ -109,11 +115,11 @@ macro_rules! impl_outer_error {
 								$crate::runtime_primitives::DispatchError {
 									module: $crate::codec::Encode.using_encoded(&self, |s| s[0]),
 									error: 0,
-									message: msg,
+									message: Some(msg),
 								},
 							_ => $crate::runtime_primitives::DispatchError {
 									module: $crate::codec::Encode.using_encoded(&self, |s| s[0]),
-									error: err.into(),
+									error: Into::<u8>::into(err) as i8,
 									message: None,
 								},
 						},

srml/system/src/lib.rs

@@ -190,7 +190,7 @@ pub trait Trait: 'static + Eq + Clone {
 	type Event: Parameter + Member + From<Event>;
 
 	/// The aggregated error type of the runtime.
-	type Error: Parameter + Member + From<Error>;
+	type Error: Member + From<Error>;
 }
 
 pub type DigestOf<T> = generic::Digest<<T as Trait>::Hash>;