Merge remote-tracking branch 'upstream/master' into improve-error-res…

…ponse

core/sr-primitives/src/lib.rs

@@ -51,6 +51,9 @@ pub mod transaction_validity;
 /// Re-export these since they're only "kind of" generic.
 pub use generic::{DigestItem, Digest};
 
+/// Re-export this since it's part of the API of this crate.
+pub use substrate_primitives::crypto::{key_types, KeyTypeId};
+
 #[cfg_attr(test, derive(PartialEq, Debug))]
 /// Primitive Error type
 pub enum PrimitiveError {
@@ -59,7 +62,7 @@ pub enum PrimitiveError {
 	Other(&'static str),
 	/// Indicating an invalid signature in extrinsic.
 	BadSignature,
-	/// Full block error.
+	/// Full block error message.
 	///
 	/// This allows modules to indicate that given transaction is potentially valid
 	/// in the future, but can't be executed in the current state.

node-template/runtime/src/lib.rs

@@ -136,6 +136,8 @@ impl system::Trait for Runtime {
 	type Origin = Origin;
 	/// The ubiquitous error type.
 	type Error = Error;
+	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
+	type BlockHashCount = BlockHashCount;
 }
 
 impl aura::Trait for Runtime {

node-template/runtime/src/template.rs

@@ -71,7 +71,7 @@ mod tests {
 
 	use runtime_io::with_externalities;
 	use primitives::{H256, Blake2Hasher};
-	use support::{{impl_outer_origin, impl_outer_error}, assert_ok};
+	use support::{impl_outer_origin, impl_outer_error, assert_ok, parameter_types};
 	use runtime_primitives::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 
 	impl_outer_origin! {
@@ -101,6 +101,7 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 	impl Trait for Test {
 		type Event = ();

node/runtime/src/lib.rs

@@ -71,8 +71,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to equal spec_version. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 105,
-	impl_version: 105,
+	spec_version: 108,
+	impl_version: 108,
 	apis: RUNTIME_API_VERSIONS,
 };
 
@@ -126,6 +126,7 @@ impl system::Trait for Runtime {
 	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	type Event = Event;
 	type Error = Error;
+	type BlockHashCount = BlockHashCount;
 }
 
 impl aura::Trait for Runtime {

srml/assets/src/lib.rs

@@ -240,7 +240,7 @@ mod tests {
 	use super::*;
 
 	use runtime_io::with_externalities;
-	use srml_support::{impl_outer_origin, impl_outer_error, assert_ok, assert_noop};
+	use srml_support::{impl_outer_origin, impl_outer_error, assert_ok, assert_noop, parameter_types};
 	use substrate_primitives::{H256, Blake2Hasher};
 	// The testing primitives are very useful for avoiding having to work with signatures
 	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
@@ -273,6 +273,7 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 	impl Trait for Test {
 		type Event = ();

srml/aura/src/mock.rs

@@ -18,8 +18,12 @@
 
 #![cfg(test)]
 
-use primitives::{traits::IdentityLookup, testing::{Header, UintAuthorityId}};
-use srml_support::{impl_outer_origin, impl_outer_error};
+use primitives::{
+	KeyTypeId,
+	traits::IdentityLookup,
+	testing::{UINT_DUMMY_KEY, Header, UintAuthorityId},
+};
+use srml_support::{impl_outer_origin, impl_outer_error, parameter_types};
 use runtime_io;
 use substrate_primitives::{H256, Blake2Hasher};
 use crate::{Trait, Module, GenesisConfig};
@@ -51,6 +55,7 @@ impl system::Trait for Test {
 	type Header = Header;
 	type Event = ();
 	type Error = Error;
+	type BlockHashCount = BlockHashCount;
 }
 
 impl timestamp::Trait for Test {

srml/authorship/src/lib.rs

@@ -354,6 +354,7 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 
 	impl Trait for Test {

srml/balances/src/lib.rs

@@ -767,6 +767,7 @@ impl<T: Subtrait<I>, I: Instance> system::Trait for ElevatedTrait<T, I> {
 	type Header = T::Header;
 	type Event = ();
 	type Error = &'static str;
+	type BlockHashCount = T::BlockHashCount;
 }
 impl<T: Subtrait<I>, I: Instance> Trait<I> for ElevatedTrait<T, I> {
 	type Balance = T::Balance;

srml/balances/src/mock.rs

@@ -21,7 +21,7 @@
 use primitives::{traits::{IdentityLookup}, testing::Header};
 use substrate_primitives::{H256, Blake2Hasher};
 use runtime_io;
-use srml_support::{impl_outer_origin, impl_outer_error, traits::Get};
+use srml_support::{impl_outer_origin, impl_outer_error, parameter_types, traits::Get};
 use std::cell::RefCell;
 use crate::{GenesisConfig, Module, Trait};
 
@@ -89,6 +89,7 @@ impl system::Trait for Runtime {
 	type Header = Header;
 	type Event = ();
 	type Error = Error;
+	type BlockHashCount = BlockHashCount;
 }
 impl Trait for Runtime {
 	type Balance = u64;

srml/contracts/src/tests.rs

@@ -116,6 +116,7 @@ impl system::Trait for Test {
 	type Header = Header;
 	type Event = MetaEvent;
 	type Error = Error;
+	type BlockHashCount = BlockHashCount;
 }
 parameter_types! {
 	pub const BalancesTransactionBaseFee: u64 = 0;

srml/council/src/lib.rs

@@ -118,6 +118,7 @@ mod tests {
 		type Header = Header;
 		type Event = Event;
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 0;

srml/democracy/src/lib.rs

@@ -994,6 +994,7 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 0;

srml/example/src/lib.rs

@@ -543,6 +543,7 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 0;

srml/executive/src/lib.rs

@@ -435,6 +435,7 @@ mod tests {
 		type Header = Header;
 		type Event = MetaEvent;
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 0;

srml/finality-tracker/src/lib.rs

@@ -315,6 +315,7 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type Error = Error;
+		type BlockHashCount = BlockHashCount;
 	}
 	parameter_types! {
 		pub const WindowSize: u64 = 11;

srml/grandpa/src/mock.rs

@@ -20,7 +20,7 @@
 
 use primitives::{DigestItem, traits::IdentityLookup, testing::{Header, UintAuthorityId}};
 use runtime_io;
-use srml_support::{impl_outer_origin, impl_outer_error, impl_outer_event};
+use srml_support::{impl_outer_origin, impl_outer_event, impl_outer_error, parameter_types};
 use substrate_primitives::{H256, Blake2Hasher};
 use parity_codec::{Encode, Decode};
 use crate::{AuthorityId, GenesisConfig, Trait, Module, ConsensusLog};
@@ -34,10 +34,8 @@ impl_outer_error! {
 	pub enum Error for Test {}
 }
 
-impl From<Signal<u64>> for DigestItem<H256> {
-	fn from(log: Signal<u64>) -> DigestItem<H256> {
-		DigestItem::Consensus(GRANDPA_ENGINE_ID, log.encode())
-	}
+pub fn grandpa_log(log: ConsensusLog<u64>) -> DigestItem<H256> {
+	DigestItem::Consensus(GRANDPA_ENGINE_ID, log.encode())
 }
 
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
@@ -47,7 +45,9 @@ pub struct Test;
 impl Trait for Test {
 	type Event = TestEvent;
 }
-
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+}
 impl system::Trait for Test {
 	type Origin = Origin;
 	type Index = u64;
@@ -59,6 +59,7 @@ impl system::Trait for Test {
 	type Header = Header;
 	type Event = TestEvent;
 	type Error = Error;
+	type BlockHashCount = BlockHashCount;
 }
 
 mod grandpa {

srml/indices/src/mock.rs

@@ -22,7 +22,7 @@ use std::collections::HashSet;
 use ref_thread_local::{ref_thread_local, RefThreadLocal};
 use primitives::testing::Header;
 use substrate_primitives::{H256, Blake2Hasher};
-use srml_support::{impl_outer_origin, impl_outer_error};
+use srml_support::{impl_outer_origin, impl_outer_error, parameter_types};
 use {runtime_io, system};
 use crate::{GenesisConfig, Module, Trait, IsDeadAccount, OnNewAccount, ResolveHint};
 
@@ -82,6 +82,7 @@ impl system::Trait for Runtime {
 	type Header = Header;
 	type Event = ();
 	type Error = Error;
+	type BlockHashCount = BlockHashCount;
 }
 impl Trait for Runtime {
 	type AccountIndex = u64;

srml/session/src/lib.rs

@@ -550,8 +550,7 @@ impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use std::cell::RefCell;
-	use srml_support::{impl_outer_origin, impl_outer_error, assert_ok};
+	use srml_support::assert_ok;
 	use runtime_io::with_externalities;
 	use substrate_primitives::Blake2Hasher;
 	use primitives::{
@@ -563,100 +562,6 @@ mod tests {
 		set_next_validators, set_session_length, session_changed, Test, Origin, System, Session,
 	};
 
-	impl_outer_origin!{
-		pub enum Origin for Test {}
-	}
-
-	impl_outer_error! {
-		pub enum Error for Test {}
-	}
-
-	thread_local!{
-		static NEXT_VALIDATORS: RefCell<Vec<u64>> = RefCell::new(vec![1, 2, 3]);
-		static AUTHORITIES: RefCell<Vec<UintAuthorityId>> =
-			RefCell::new(vec![UintAuthorityId(1), UintAuthorityId(2), UintAuthorityId(3)]);
-		static FORCE_SESSION_END: RefCell<bool> = RefCell::new(false);
-		static SESSION_LENGTH: RefCell<u64> = RefCell::new(2);
-		static SESSION_CHANGED: RefCell<bool> = RefCell::new(false);
-		static TEST_SESSION_CHANGED: RefCell<bool> = RefCell::new(false);
-	}
-
-	pub struct TestShouldEndSession;
-	impl ShouldEndSession<u64> for TestShouldEndSession {
-		fn should_end_session(now: u64) -> bool {
-			let l = SESSION_LENGTH.with(|l| *l.borrow());
-			now % l == 0 || FORCE_SESSION_END.with(|l| { let r = *l.borrow(); *l.borrow_mut() = false; r })
-		}
-	}
-
-	pub struct TestSessionHandler;
-	impl SessionHandler<u64> for TestSessionHandler {
-		fn on_new_session<T: OpaqueKeys>(changed: bool, validators: &[(u64, T)]) {
-			SESSION_CHANGED.with(|l| *l.borrow_mut() = changed);
-			AUTHORITIES.with(|l|
-				*l.borrow_mut() = validators.iter().map(|(_, id)| id.get::<UintAuthorityId>(0).unwrap_or_default()).collect()
-			);
-		}
-		fn on_disabled(_validator_index: usize) {}
-	}
-
-	pub struct TestOnSessionEnding;
-	impl OnSessionEnding<u64> for TestOnSessionEnding {
-		fn on_session_ending(_: SessionIndex) -> Option<Vec<u64>> {
-			if !TEST_SESSION_CHANGED.with(|l| *l.borrow()) {
-				Some(NEXT_VALIDATORS.with(|l| l.borrow().clone()))
-			} else {
-				None
-			}
-		}
-	}
-
-	fn authorities() -> Vec<UintAuthorityId> {
-		AUTHORITIES.with(|l| l.borrow().to_vec())
-	}
-
-	fn force_new_session() {
-		FORCE_SESSION_END.with(|l| *l.borrow_mut() = true )
-	}
-
-	fn set_session_length(x: u64) {
-		SESSION_LENGTH.with(|l| *l.borrow_mut() = x )
-	}
-
-	fn session_changed() -> bool {
-		SESSION_CHANGED.with(|l| *l.borrow())
-	}
-
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
-	impl system::Trait for Test {
-		type Origin = Origin;
-		type Index = u64;
-		type BlockNumber = u64;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
-		type Event = ();
-		type Error = Error;
-	}
-	impl timestamp::Trait for Test {
-		type Moment = u64;
-		type OnTimestampSet = ();
-	}
-	impl Trait for Test {
-		type ShouldEndSession = TestShouldEndSession;
-		type OnSessionEnding = TestOnSessionEnding;
-		type SessionHandler = TestSessionHandler;
-		type Keys = UintAuthorityId;
-		type Event = ();
-		type SelectInitialValidators = ();
-	}
-
-	type System = system::Module<Test>;
-	type Session = Module<Test>;
-
 	fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
 		let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		timestamp::GenesisConfig::<Test> {

srml/session/src/mock.rs

@@ -18,7 +18,7 @@
 
 use super::*;
 use std::cell::RefCell;
-use srml_support::{impl_outer_origin, parameter_types};
+use srml_support::{impl_outer_origin, impl_outer_error, parameter_types};
 use substrate_primitives::H256;
 use primitives::{
 	traits::{BlakeTwo256, IdentityLookup, ConvertInto},
@@ -30,6 +30,10 @@ impl_outer_origin! {
 	pub enum Origin for Test {}
 }
 
+impl_outer_error! {
+	pub enum Error for Test {}
+}
+
 thread_local! {
 	pub static NEXT_VALIDATORS: RefCell<Vec<u64>> = RefCell::new(vec![1, 2, 3]);
 	pub static AUTHORITIES: RefCell<Vec<UintAuthorityId>> =
@@ -120,6 +124,7 @@ impl system::Trait for Test {
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
 	type Event = ();
+	type Error = Error;
 	type BlockHashCount = BlockHashCount;
 }
 impl timestamp::Trait for Test {

srml/staking/src/mock.rs

@@ -106,6 +106,7 @@ impl system::Trait for Test {
 	type Header = Header;
 	type Event = ();
 	type Error = Error;
+	type BlockHashCount = BlockHashCount;
 }
 parameter_types! {
 	pub const TransferFee: u64 = 0;