more test fixes

srml/aura/src/mock.rs

@@ -19,7 +19,7 @@
 #![cfg(test)]
 
 use primitives::{BuildStorage, traits::IdentityLookup, testing::{Header, UintAuthorityId}};
-use srml_support::impl_outer_origin;
+use srml_support::{impl_outer_origin, impl_outer_error};
 use runtime_io;
 use substrate_primitives::{H256, Blake2Hasher};
 use crate::{Trait, Module, GenesisConfig};
@@ -28,15 +28,14 @@ impl_outer_origin!{
 	pub enum Origin for Test {}
 }
 
+impl_outer_error! {
+	pub enum Error for Runtime {}
+}
+
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Test;
 
-#[allow(non_camel_case_types)]
-pub enum Error {
-	system(system::Error)
-}
-
 impl system::Trait for Test {
 	type Origin = Origin;
 	type Index = u64;

srml/balances/src/lib.rs

@@ -152,7 +152,7 @@
 use rstd::prelude::*;
 use rstd::{cmp, result, mem};
 use parity_codec::{Codec, Encode, Decode};
-use srml_support::{StorageValue, StorageMap, Parameter, decl_event, decl_storage, decl_module};
+use srml_support::{StorageValue, StorageMap, Parameter, decl_event, decl_storage, decl_module, decl_error};
 use srml_support::traits::{
 	UpdateBalanceOutcome, Currency, OnFreeBalanceZero, MakePayment, OnUnbalanced,
 	WithdrawReason, WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
@@ -170,6 +170,8 @@ mod tests;
 
 pub use self::imbalances::{PositiveImbalance, NegativeImbalance};
 
+pub type DispatchResult<T, I> = srml_support::dispatch::DispatchResult<<T as Trait<I>>::Error>;
+
 pub trait Subtrait<I: Instance = DefaultInstance>: system::Trait {
 	/// The balance of an account.
 	type Balance: Parameter + Member + SimpleArithmetic + Codec + Default + Copy +
@@ -211,6 +213,9 @@ pub trait Trait<I: Instance = DefaultInstance>: system::Trait {
 
 	/// The overarching event type.
 	type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
+
+	/// The overarching error type.
+	type Error: From<Error> + From<system::Error> + From<&'static str>;
 }
 
 impl<T: Trait<I>, I: Instance> Subtrait<I> for T {
@@ -233,6 +238,19 @@ decl_event!(
 	}
 );
 
+decl_error! {
+	pub enum Error {
+	}
+}
+
+impl From<Error> for &'static str {
+	fn from(err: Error) -> &'static str {
+		match err {
+			Error::Unknown(msg) => msg,
+		}
+	}
+}
+
 /// Struct to encode the vesting schedule of an individual account.
 #[derive(Encode, Decode, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "std", derive(Debug))]
@@ -340,6 +358,8 @@ decl_storage! {
 
 decl_module! {
 	pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
+		type Error = <T as Trait<I>>::Error;
+
 		fn deposit_event<T, I>() = default;
 
 		/// Transfer some liquid free balance to another account.
@@ -707,6 +727,7 @@ impl<T: Subtrait<I>, I: Instance> Trait<I> for ElevatedTrait<T, I> {
 	type TransactionPayment = ();
 	type TransferPayment = ();
 	type DustRemoval = ();
+	type Error = &'static str;
 }
 
 impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I>

srml/balances/src/mock.rs

@@ -29,8 +29,14 @@ impl_outer_origin!{
 	pub enum Origin for Runtime {}
 }
 
+mod balances {
+	pub use crate::Error;
+}
+
 impl_outer_error! {
-	pub enum Error for Runtime {}
+	pub enum Error for Runtime {
+		balances,
+	}
 }
 
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
@@ -56,6 +62,7 @@ impl Trait for Runtime {
 	type TransactionPayment = ();
 	type DustRemoval = ();
 	type TransferPayment = ();
+	type Error = Error;
 }
 
 pub struct ExtBuilder {

srml/balances/src/tests.rs

@@ -208,7 +208,7 @@ fn default_indexing_on_new_accounts_should_not_work2() {
 			// account 1 has 256 * 10 = 2560, account 5 is not exist, ext_deposit is 10, value is 9, not satisfies for ext_deposit
 			assert_noop!(
 				Balances::transfer(Some(1).into(), 5, 9),
-				"value too low to create account"
+				mock::Error::balances(Error::Unknown("value too low to create account"))
 			);
 			assert_eq!(Balances::is_dead_account(&5), true); // account 5 should not exist
 			assert_eq!(Balances::free_balance(&1), 100);
@@ -347,7 +347,10 @@ fn balance_transfer_when_reserved_should_not_work() {
 	with_externalities(&mut ExtBuilder::default().build(), || {
 		let _ = Balances::deposit_creating(&1, 111);
 		assert_ok!(Balances::reserve(&1, 69));
-		assert_noop!(Balances::transfer(Some(1).into(), 2, 69), "balance too low to send value");
+		assert_noop!(
+			Balances::transfer(Some(1).into(), 2, 69),
+			mock::Error::balances(Error::Unknown("balance too low to send value"))
+		);
 	});
 }
 
@@ -475,7 +478,7 @@ fn transferring_too_high_value_should_not_panic() {
 
 		assert_err!(
 			Balances::transfer(Some(1).into(), 2, u64::max_value()),
-			"destination balance too high to receive value"
+			mock::Error::balances(Error::Unknown("destination balance too high to receive value"))
 		);
 
 		assert_eq!(Balances::free_balance(&1), u64::max_value());
@@ -553,7 +556,7 @@ fn transfer_overflow_isnt_exploitable() {
 
 			assert_err!(
 				Balances::transfer(Some(1).into(), 5, evil_value),
-				"got overflow after adding a fee to value"
+				mock::Error::balances(Error::Unknown("got overflow after adding a fee to value"))
 			);
 		}
 	);
@@ -617,7 +620,7 @@ fn unvested_balance_should_not_transfer() {
 			assert_eq!(Balances::vesting_balance(&1), 90); // Account 1 has only 10 units vested at block 1
 			assert_noop!(
 				Balances::transfer(Some(1).into(), 2, 11),
-				"vesting balance too high to send value"
+				mock::Error::balances(Error::Unknown("vesting balance too high to send value"))
 			); // Account 1 cannot send more than vested amount
 		}
 	);

srml/support/src/dispatch.rs

@@ -424,7 +424,10 @@ macro_rules! decl_module {
 	};
 	(@normalize
 		$(#[$attr:meta])*
-		pub struct $mod_type:ident<$trait_instance:ident: $trait_name:ident>
+		pub struct $mod_type:ident<
+			$trait_instance:ident:
+				$trait_name:ident$(<I>, $instance:ident: $instantiable:path $(= $module_default_instance:path)?)?
+			>
 		for enum $call_type:ident where origin: $origin_type:ty, system = $system:ident
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
@@ -438,7 +441,9 @@ macro_rules! decl_module {
 	) => {
 		$crate::decl_module!(@normalize
 			$(#[$attr])*
-			pub struct $mod_type<$trait_instance: $trait_name>
+			pub struct $mod_type<
+				$trait_instance: $trait_name$(<I>, $instance: $instantiable $(= $module_default_instance)?)?
+			>
 			for enum $call_type where origin: $origin_type, system = $system
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
@@ -449,7 +454,7 @@ macro_rules! decl_module {
 			$($rest)*
 		);
 	};
-	// This puts the function statement into the [], decreasing `$rest` and moving toward finishing the parse.
+	// Add default Error if none supplied
 	(@normalize
 		$(#[$attr:meta])*
 		pub struct $mod_type:ident<
@@ -461,13 +466,8 @@ macro_rules! decl_module {
 		{ $( $on_initialize:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
-		{ $error_type:ty }
+		{ }
 		[ $($t:tt)* ]
-		$(#[doc = $doc_attr:tt])*
-		#[weight = $weight:expr]
-		$fn_vis:vis fn $fn_name:ident(
-			$origin:ident $(, $(#[$codec_attr:ident])* $param_name:ident : $param:ty)*
-		) $( -> $result:ty )* { $( $impl:tt )* }
 		$($rest:tt)*
 	) => {
 		$crate::decl_module!(@normalize
@@ -480,20 +480,12 @@ macro_rules! decl_module {
 			{ $( $on_initialize )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
-			{ $error_type }
-			[
-				$($t)*
-				$(#[doc = $doc_attr])*
-				#[weight = $weight]
-				$fn_vis fn $fn_name(
-					$origin $( , $(#[$codec_attr])* $param_name : $param )*
-				) $( -> $result )* { $( $impl )* }
-				{ $($instance: $instantiable)? }
-			]
+			{ &'static str }
+			[ $($t)* ]
 			$($rest)*
 		);
 	};
-	// Add #[weight] if none is defined.
+	// This puts the function statement into the [], decreasing `$rest` and moving toward finishing the parse.
 	(@normalize
 		$(#[$attr:meta])*
 		pub struct $mod_type:ident<
@@ -505,11 +497,12 @@ macro_rules! decl_module {
 		{ $( $on_initialize:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
-		{ $( $error_type:tt )* }
+		{ $error_type:ty }
 		[ $($t:tt)* ]
 		$(#[doc = $doc_attr:tt])*
+		#[weight = $weight:expr]
 		$fn_vis:vis fn $fn_name:ident(
-			$from:ident $(, $(#[$codec_attr:ident])* $param_name:ident : $param:ty)*
+			$origin:ident $(, $(#[$codec_attr:ident])* $param_name:ident : $param:ty)*
 		) $( -> $result:ty )* { $( $impl:tt )* }
 		$($rest:tt)*
 	) => {
@@ -523,17 +516,20 @@ macro_rules! decl_module {
 			{ $( $on_initialize )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
-			{ $( $error_type )* }
-			[ $($t)* ]
-			$(#[doc = $doc_attr])*
-			#[weight = $crate::dispatch::TransactionWeight::default()]
-			$fn_vis fn $fn_name(
-				$from $(, $(#[$codec_attr])* $param_name : $param )*
-			) $( -> $result )* { $( $impl )* }
+			{ $error_type }
+			[
+				$($t)*
+				$(#[doc = $doc_attr])*
+				#[weight = $weight]
+				$fn_vis fn $fn_name(
+					$origin $( , $(#[$codec_attr])* $param_name : $param )*
+				) $( -> $result )* { $( $impl )* }
+				{ $($instance: $instantiable)? }
+			]
 			$($rest)*
 		);
 	};
-	// Add default Error if none supplied
+	// Add #[weight] if none is defined.
 	(@normalize
 		$(#[$attr:meta])*
 		pub struct $mod_type:ident<
@@ -545,8 +541,12 @@ macro_rules! decl_module {
 		{ $( $on_initialize:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
-		{ }
+		{ $( $error_type:tt )* }
 		[ $($t:tt)* ]
+		$(#[doc = $doc_attr:tt])*
+		$fn_vis:vis fn $fn_name:ident(
+			$from:ident $(, $(#[$codec_attr:ident])* $param_name:ident : $param:ty)*
+		) $( -> $result:ty )* { $( $impl:tt )* }
 		$($rest:tt)*
 	) => {
 		$crate::decl_module!(@normalize
@@ -559,8 +559,13 @@ macro_rules! decl_module {
 			{ $( $on_initialize )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
-			{ &'static str }
+			{ $( $error_type )* }
 			[ $($t)* ]
+			$(#[doc = $doc_attr])*
+			#[weight = $crate::dispatch::TransactionWeight::default()]
+			$fn_vis fn $fn_name(
+				$from $(, $(#[$codec_attr])* $param_name : $param )*
+			) $( -> $result )* { $( $impl )* }
 			$($rest)*
 		);
 	};

srml/support/src/error.rs

@@ -96,7 +96,7 @@ macro_rules! impl_outer_error {
 		impl Into<$crate::runtime_primitives::DispatchError> for $name {
 			fn into(self) -> $crate::runtime_primitives::DispatchError {
 				match self {
-					$name::system(err) => match err {
+					$name::system(ref err) => match err {
 						$system::Error::Unknown(msg) =>
 							$crate::runtime_primitives::DispatchError {
 								module: 0,
@@ -110,15 +110,15 @@ macro_rules! impl_outer_error {
 							},
 					},
 					$(
-						$name::$module(err) => match err {
+						$name::$module(ref err) => match err {
 							$module::Error::Unknown(msg) =>
 								$crate::runtime_primitives::DispatchError {
-									module: $crate::codec::Encode.using_encoded(&self, |s| s[0]),
+									module: $crate::codec::Encode::using_encoded(&self, |s| s[0]),
 									error: 0,
 									message: Some(msg),
 								},
 							_ => $crate::runtime_primitives::DispatchError {
-									module: $crate::codec::Encode.using_encoded(&self, |s| s[0]),
+									module: $crate::codec::Encode::using_encoded(&self, |s| s[0]),
 									error: Into::<u8>::into(err),
 									message: None,
 								},
@@ -130,7 +130,7 @@ macro_rules! impl_outer_error {
 
 		$(
 			impl From<$module::Error> for $name {
-				fn from(err: $system::Error) -> Self {
+				fn from(err: $module::Error) -> Self {
 					$name::$module(err)
 				}
 			}
@@ -174,11 +174,12 @@ macro_rules! decl_error {
 		impl From<Error> for () {
 			fn from(_: Error) -> () { () }
 		}
-		impl Into<u8> for Error {
-			fn into(self) -> u8 {
-				match self {
+
+		impl From<&Error> for u8 {
+			fn from(err: &Error) -> u8 {
+				match err {
 					Error::Unknown(_) => 0,
-					_ => $crate::codec::Encode::using_encoded(&self, |s| s[0]),
+					_ => $crate::codec::Encode::using_encoded(err, |s| s[0]),
 				}
 			}
 		}

srml/system/src/lib.rs

@@ -202,7 +202,7 @@ pub type KeyValue = (Vec<u8>, Vec<u8>);
 
 decl_module! {
 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
-		type Error = Error;
+		type Error = T::Error;
 
 		/// Deposits an event into this block's event record.
 		pub fn deposit_event(event: T::Event) {