Merge branch 'master' of github.com:paritytech/substrate into a-fix-sync

Cargo.toml

@@ -29,6 +29,9 @@ members = [
 	"core/rpc",
 	"core/rpc/primitives",
 	"core/rpc-servers",
+	"core/runtime-interface",
+	"core/runtime-interface/proc-macro",
+	"core/runtime-interface/test-wasm",
 	"core/serializer",
 	"core/service",
 	"core/service/test",

core/application-crypto/src/ed25519.rs

@@ -18,6 +18,8 @@
 
 use crate::{RuntimePublic, KeyTypeId};
 
+use rstd::vec::Vec;
+
 pub use primitives::ed25519::*;
 
 mod app {
@@ -29,28 +31,27 @@ mod app {
 	}
 }
 
-pub use app::Public as AppPublic;
-pub use app::Signature as AppSignature;
+pub use app::{Public as AppPublic, Signature as AppSignature};
 #[cfg(feature = "full_crypto")]
 pub use app::Pair as AppPair;
 
 impl RuntimePublic for Public {
 	type Signature = Signature;
 
 	fn all(key_type: KeyTypeId) -> crate::Vec<Self> {
-		runtime_io::ed25519_public_keys(key_type)
+		runtime_io::crypto::ed25519_public_keys(key_type)
 	}
 
-	fn generate_pair(key_type: KeyTypeId, seed: Option<&str>) -> Self {
-		runtime_io::ed25519_generate(key_type, seed)
+	fn generate_pair(key_type: KeyTypeId, seed: Option<Vec<u8>>) -> Self {
+		runtime_io::crypto::ed25519_generate(key_type, seed)
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		runtime_io::ed25519_sign(key_type, self, msg.as_ref())
+		runtime_io::crypto::ed25519_sign(key_type, self, msg.as_ref())
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {
-		runtime_io::ed25519_verify(&signature, msg.as_ref(), self)
+		runtime_io::crypto::ed25519_verify(&signature, msg.as_ref(), self)
 	}
 }
 

core/application-crypto/src/lib.rs

@@ -286,7 +286,7 @@ macro_rules! app_crypto_public_common {
 				<$public as $crate::RuntimePublic>::all($key_type).into_iter().map(Self).collect()
 			}
 
-			fn generate_pair(seed: Option<&str>) -> Self {
+			fn generate_pair(seed: Option<$crate::Vec<u8>>) -> Self {
 				Self(<$public as $crate::RuntimePublic>::generate_pair($key_type, seed))
 			}
 

core/application-crypto/src/sr25519.rs

@@ -18,6 +18,8 @@
 
 use crate::{RuntimePublic, KeyTypeId};
 
+use rstd::vec::Vec;
+
 pub use primitives::sr25519::*;
 
 mod app {
@@ -29,28 +31,27 @@ mod app {
 	}
 }
 
-pub use app::Public as AppPublic;
-pub use app::Signature as AppSignature;
+pub use app::{Public as AppPublic, Signature as AppSignature};
 #[cfg(feature = "full_crypto")]
 pub use app::Pair as AppPair;
 
 impl RuntimePublic for Public {
 	type Signature = Signature;
 
 	fn all(key_type: KeyTypeId) -> crate::Vec<Self> {
-		runtime_io::sr25519_public_keys(key_type)
+		runtime_io::crypto::sr25519_public_keys(key_type)
 	}
 
-	fn generate_pair(key_type: KeyTypeId, seed: Option<&str>) -> Self {
-		runtime_io::sr25519_generate(key_type, seed)
+	fn generate_pair(key_type: KeyTypeId, seed: Option<Vec<u8>>) -> Self {
+		runtime_io::crypto::sr25519_generate(key_type, seed)
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		runtime_io::sr25519_sign(key_type, self, msg.as_ref())
+		runtime_io::crypto::sr25519_sign(key_type, self, msg.as_ref())
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {
-		runtime_io::sr25519_verify(&signature, msg.as_ref(), self)
+		runtime_io::crypto::sr25519_verify(&signature, msg.as_ref(), self)
 	}
 }