Refactor key management (#3296)

* Add Call type to extensible transactions.

Cleanup some naming

* Merge Resource and BlockExhausted into just Exhausted

* Fix

* Another fix

* Call

* Some fixes

* Fix srml tests.

* Fix all tests.

* Refactor crypto so each application of it has its own type.

* Introduce new AuthorityProvider API into Aura

This will eventually allow for dynamic determination of authority
keys and avoid having to set them directly on CLI.

* Introduce authority determinator for Babe.

Experiment with modular consensus API.

* Work in progress to introduce KeyTypeId and avoid polluting API
with validator IDs

* Finish up drafting imonline

* Rework offchain workers API.

* Rework API implementation.

* Make it compile for wasm, simplify app_crypto.

* Fix compilation of im-online.

* Fix compilation of im-online.

* Fix more compilation errors.

* Make it compile.

* Fixing tests.

* Rewrite `keystore`

* Fix session tests

* Bring back `TryFrom`'s'

* Fix `srml-grandpa`

* Fix `srml-aura`

* Fix consensus babe

* More fixes

* Make service generate keys from dev_seed

* Build fixes

* Remove offchain tests

* More fixes and cleanups

* Fixes finality grandpa

* Fix `consensus-aura`

* Fix cli

* Fix `node-cli`

* Fix chain_spec builder

* Fix doc tests

* Add authority getter for grandpa.

* Test fix

* Fixes

* Make keystore accessible from the runtime

* Move app crypto to its own crate

* Update `Cargo.lock`

* Make the crypto stuff usable from the runtime

* Adds some runtime crypto tests

* Use last finalized block for grandpa authority

* Fix warning

* Adds `SessionKeys` runtime api

* Remove `FinalityPair` and `ConsensusPair`

* Minor governance tweaks to get it inline with docs.

* Make the governance be up to date with the docs.

* Build fixes.

* Generate the inital session keys

* Failing keystore is a hard error

* Make babe work again

* Fix grandpa

* Fix tests

* Disable `keystore` in consensus critical stuff

* Build fix.

* ImOnline supports multiple authorities at once.

* Update core/application-crypto/src/ed25519.rs

* Merge branch 'master' into gav-in-progress

* Remove unneeded code for now.

* Some `session` testing

* Support querying the public keys

* Cleanup offchain

* Remove warnings

* More cleanup

* Apply suggestions from code review

Co-Authored-By: Benjamin Kampmann <ben.kampmann@googlemail.com>

* More cleanups

* JSONRPC API for setting keys.

Also, rename traits::KeyStore* -> traits::BareCryptoStore*

* Bad merge

* Fix integration tests

* Fix test build

* Test fix

* Fixes

* Warnings

* Another warning

* Bump version.

substrate/core/test-client/src/lib.rs

@@ -30,7 +30,7 @@ pub use keyring::{
 	ed25519::Keyring as Ed25519Keyring,
 	sr25519::Keyring as Sr25519Keyring,
 };
-pub use primitives::Blake2Hasher;
+pub use primitives::{Blake2Hasher, traits::BareCryptoStorePtr};
 pub use sr_primitives::{StorageOverlay, ChildrenStorageOverlay};
 pub use state_machine::ExecutionStrategy;
 
@@ -73,6 +73,7 @@ pub struct TestClientBuilder<Executor, Backend, G: GenesisInit = ()> {
 	child_storage_extension: HashMap<Vec<u8>, Vec<(Vec<u8>, Vec<u8>)>>,
 	backend: Arc<Backend>,
 	_executor: std::marker::PhantomData<Executor>,
+	keystore: Option<BareCryptoStorePtr>,
 }
 
 impl<Block, Executor> Default for TestClientBuilder<
@@ -100,11 +101,7 @@ impl<Block, Executor, G: GenesisInit> TestClientBuilder<
 	}
 }
 
-impl<Executor, Backend, G: GenesisInit> TestClientBuilder<
-	Executor,
-	Backend,
-	G,
-> {
+impl<Executor, Backend, G: GenesisInit> TestClientBuilder<Executor, Backend, G> {
 	/// Create a new instance of the test client builder.
 	pub fn with_backend(backend: Arc<Backend>) -> Self {
 		TestClientBuilder {
@@ -113,9 +110,16 @@ impl<Executor, Backend, G: GenesisInit> TestClientBuilder<
 			child_storage_extension: Default::default(),
 			genesis_init: Default::default(),
 			_executor: Default::default(),
+			keystore: None,
 		}
 	}
 
+	/// Set the keystore that should be used by the externalities.
+	pub fn set_keystore(mut self, keystore: BareCryptoStorePtr) -> Self {
+		self.keystore = Some(keystore);
+		self
+	}
+
 	/// Alter the genesis storage parameters.
 	pub fn genesis_init_mut(&mut self) -> &mut G {
 		&mut self.genesis_init
@@ -184,7 +188,7 @@ impl<Executor, Backend, G: GenesisInit> TestClientBuilder<
 			self.backend.clone(),
 			executor,
 			storage,
-			self.execution_strategies
+			self.execution_strategies,
 		).expect("Creates new client");
 
 		let longest_chain = client::LongestChain::new(self.backend);
@@ -200,7 +204,7 @@ impl<E, Backend, G: GenesisInit> TestClientBuilder<
 > {
 	/// Build the test client with the given native executor.
 	pub fn build_with_native_executor<Block, RuntimeApi, I>(
-		self,
+		mut self,
 		executor: I,
 	) -> (
 		client::Client<
@@ -217,7 +221,7 @@ impl<E, Backend, G: GenesisInit> TestClientBuilder<
 		Block: BlockT<Hash=<Blake2Hasher as Hasher>::Out>,
 	{
 		let executor = executor.into().unwrap_or_else(|| executor::NativeExecutor::new(None));
-		let executor = LocalCallExecutor::new(self.backend.clone(), executor);
+		let executor = LocalCallExecutor::new(self.backend.clone(), executor, self.keystore.take());
 
 		self.build_with_executor(executor)
 	}