Fixed rpc tests

substrate/rpc/Cargo.toml

@@ -15,3 +15,4 @@ substrate-executor = { path = "../executor" }
 [dev-dependencies]
 assert_matches = "1.1"
 substrate-executor = { path = "../executor" }
+substrate-runtime-support = { path = "../runtime-support" }

substrate/rpc/src/chain/tests.rs

@@ -16,6 +16,7 @@
 
 use substrate_executor as executor;
 use client;
+use runtime_support::Hashable;
 use super::*;
 
 #[test]
@@ -31,7 +32,7 @@ fn should_return_header() {
 	let client = client::new_in_mem(executor::WasmExecutor, || (test_genesis_block.clone(), vec![])).unwrap();
 
 	assert_matches!(
-		ChainApi::header(&client, "af65e54217fb213853703d57b80fc5b2bb834bf923046294d7a49bff62f0a8b2".into()),
+		ChainApi::header(&client, test_genesis_block.blake2_256().into()),
 		Ok(Some(ref x)) if x == &block::Header {
 			parent_hash: 0.into(),
 			number: 0,

substrate/rpc/src/lib.rs

@@ -33,6 +33,8 @@ extern crate substrate_executor;
 #[cfg(test)]
 #[macro_use]
 extern crate assert_matches;
+#[cfg(test)]
+extern crate substrate_runtime_support as runtime_support;
 
 pub mod chain;
 pub mod state;

substrate/rpc/src/state/tests.rs

@@ -17,6 +17,7 @@
 use super::*;
 use substrate_executor as executor;
 use self::error::{Error, ErrorKind};
+use runtime_support::Hashable;
 use client;
 
 #[test]
@@ -30,7 +31,7 @@ fn should_return_storage() {
 	};
 
 	let client = client::new_in_mem(executor::WasmExecutor, || (test_genesis_block.clone(), vec![])).unwrap();
-	let genesis_hash = "af65e54217fb213853703d57b80fc5b2bb834bf923046294d7a49bff62f0a8b2".into();
+	let genesis_hash = test_genesis_block.blake2_256().into();
 
 	assert_matches!(
 		StateApi::storage(&client, StorageKey(vec![10]), genesis_hash),
@@ -51,7 +52,7 @@ fn should_call_contract() {
 	};
 
 	let client = client::new_in_mem(executor::WasmExecutor, || (test_genesis_block.clone(), vec![])).unwrap();
-	let genesis_hash = "af65e54217fb213853703d57b80fc5b2bb834bf923046294d7a49bff62f0a8b2".into();
+	let genesis_hash = test_genesis_block.blake2_256().into();
 
 	assert_matches!(
 		StateApi::call(&client, "balanceOf".into(), vec![1,2,3], genesis_hash),