Merge branch 'master' into overlay_change

Author: cheme

Cargo.lock

@@ -42,7 +42,7 @@ impl RuntimePublic for Public {
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		runtime_io::ed25519_sign(key_type, self, msg)
+		runtime_io::ed25519_sign(key_type, self, msg.as_ref())
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {

core/application-crypto/src/ed25519.rs

@@ -213,6 +213,7 @@ macro_rules! app_crypto {
 		}
 
 		impl $crate::RuntimeAppPublic for Public where $public: $crate::RuntimePublic<Signature=$sig> {
+			const ID: $crate::KeyTypeId = $key_type;
 			type Signature = Signature;
 
 			fn all() -> $crate::Vec<Self> {

core/application-crypto/src/lib.rs

@@ -42,7 +42,7 @@ impl RuntimePublic for Public {
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		runtime_io::sr25519_sign(key_type, self, msg)
+		runtime_io::sr25519_sign(key_type, self, msg.as_ref())
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {

core/application-crypto/src/sr25519.rs

@@ -96,7 +96,10 @@ pub trait RuntimePublic: Sized {
 }
 
 /// A runtime interface for an application's public key.
-pub trait RuntimeAppPublic: Sized {
+pub trait RuntimeAppPublic: Sized  {
+	/// An identifier for this application-specific key type.
+	const ID: KeyTypeId;
+
 	/// The signature that will be generated when signing with the corresponding private key.
 	type Signature: Codec + MaybeDebugHash + Eq + PartialEq + Clone;
 

core/application-crypto/src/traits.rs

@@ -15,7 +15,6 @@ client = { package = "substrate-client", path = "../../core/client" }
 codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
 derive_more = "0.14.0"
 futures = "0.1"
-keystore = { package = "substrate-keystore", path = "../../core/keystore" }
 libp2p = { version = "0.12.0", default-features = false, features = ["secp256k1", "libp2p-websocket"] }
 log = "0.4"
 network = { package = "substrate-network", path = "../../core/network" }

core/authority-discovery/Cargo.toml

@@ -705,7 +705,9 @@ impl<CC, RP> StructOpt for CoreParams<CC, RP> where
 		)
 		.subcommand(
 			ExportBlocksCmd::augment_clap(SubCommand::with_name("export-blocks"))
-				.about("Export blocks to a file.")
+				.about("Export blocks to a file. This file can only be re-imported \
+						if it is in binary format (not JSON!)."
+					)
 		)
 		.subcommand(
 			ImportBlocksCmd::augment_clap(SubCommand::with_name("import-blocks"))

core/cli/src/params.rs

@@ -1527,7 +1527,7 @@ mod tests {
 		let header = Header {
 			number,
 			parent_hash,
-			state_root: BlakeTwo256::trie_root::<_, &[u8], &[u8]>(Vec::new()),
+			state_root: BlakeTwo256::trie_root(Vec::new()),
 			digest,
 			extrinsics_root,
 		};

core/client/db/src/lib.rs

@@ -128,7 +128,7 @@ where
 		debug_assert_eq!(
 			self.header.extrinsics_root().clone(),
 			HashFor::<Block>::ordered_trie_root(
-				self.extrinsics.iter().map(Encode::encode)
+				self.extrinsics.iter().map(Encode::encode).collect(),
 			),
 		);
 

core/client/src/block_builder/block_builder.rs

@@ -25,7 +25,7 @@ pub fn construct_genesis_block<
 	state_root: Block::Hash
 ) -> Block {
 	let extrinsics_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-		std::iter::empty::<(&[u8], &[u8])>(),
+		Vec::new(),
 	);
 
 	Block::new(