Remove usage of substrate-test-runtime.

runtime/test-runtime/Cargo.toml

@@ -25,7 +25,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", branch = "master
 version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-
+sc-client = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
 authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -78,6 +78,7 @@ std = [
 	"sp-api/std",
 	"tx-pool-api/std",
 	"block-builder-api/std",
+	"sc-client",
 	"rstd/std",
 	"sp-io/std",
 	"frame-support/std",

runtime/test-runtime/client/Cargo.toml

@@ -10,7 +10,6 @@ sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "
 substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-test-runtime = { path = ".." }
-substrate-test-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }

runtime/test-runtime/client/src/lib.rs

@@ -26,7 +26,7 @@ pub use sc_client::LongestChain;
 
 use sp_core::{sr25519, ChangesTrieConfiguration, map, twox_128};
 use sp_core::storage::{ChildInfo, Storage, StorageChild};
-use substrate_test_runtime::genesismap::{GenesisConfig};
+use polkadot_test_runtime::genesismap::GenesisConfig;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, HashFor};
 use sc_client::{
 	light::fetcher::{
@@ -94,11 +94,6 @@ impl GenesisParameters {
 				sr25519::Public::from(Sr25519Keyring::Bob).into(),
 				sr25519::Public::from(Sr25519Keyring::Charlie).into(),
 			],
-			vec![
-				AccountKeyring::Alice.into(),
-				AccountKeyring::Bob.into(),
-				AccountKeyring::Charlie.into(),
-			],
 			1000,
 			self.heap_pages_override,
 			self.extra_storage.clone(),
@@ -256,7 +251,7 @@ type MaybeFetcherCallback<Req, Resp> = Option<Box<dyn Fn(Req) -> Result<Resp, sp
 #[derive(Default)]
 pub struct LightFetcher {
 	call: MaybeFetcherCallback<RemoteCallRequest<polkadot_test_runtime::Header>, Vec<u8>>,
-	body: MaybeFetcherCallback<RemoteBodyRequest<polkadot_test_runtime::Header>, Vec<substrate_test_runtime::Extrinsic>>,
+	body: MaybeFetcherCallback<RemoteBodyRequest<polkadot_test_runtime::Header>, Vec<polkadot_test_runtime::Extrinsic>>,
 }
 
 impl LightFetcher {
@@ -274,7 +269,7 @@ impl LightFetcher {
 	/// Sets remote body callback.
 	pub fn with_remote_body(
 		self,
-		body: MaybeFetcherCallback<RemoteBodyRequest<polkadot_test_runtime::Header>, Vec<substrate_test_runtime::Extrinsic>>,
+		body: MaybeFetcherCallback<RemoteBodyRequest<polkadot_test_runtime::Header>, Vec<polkadot_test_runtime::Extrinsic>>,
 	) -> Self {
 		LightFetcher {
 			call: self.call,

runtime/test-runtime/src/genesismap.rs

@@ -0,0 +1,117 @@
+// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Tool for creating the genesis block.
+
+use std::collections::BTreeMap;
+use sp_io::hashing::{blake2_256, twox_128};
+use super::{AccountId, WASM_BINARY};
+use codec::{Encode, KeyedVec, Joiner};
+use sp_core::{ChangesTrieConfiguration, map};
+use sp_core::storage::{well_known_keys, Storage};
+use sp_runtime::BuildStorage;
+use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT};
+
+/// Configuration of a general Substrate test genesis block.
+pub struct GenesisConfig {
+	changes_trie_config: Option<ChangesTrieConfiguration>,
+	balances: Vec<(AccountId, u64)>,
+	heap_pages_override: Option<u64>,
+	/// Additional storage key pairs that will be added to the genesis map.
+	extra_storage: Storage,
+}
+
+impl GenesisConfig {
+	pub fn new(
+		changes_trie_config: Option<ChangesTrieConfiguration>,
+		endowed_accounts: Vec<AccountId>,
+		balance: u64,
+		heap_pages_override: Option<u64>,
+		extra_storage: Storage,
+	) -> Self {
+		GenesisConfig {
+			changes_trie_config,
+			balances: endowed_accounts.into_iter().map(|a| (a, balance)).collect(),
+			heap_pages_override,
+			extra_storage,
+		}
+	}
+
+	pub fn genesis_map(&self) -> Storage {
+		let wasm_runtime = WASM_BINARY.to_vec();
+		let mut map: BTreeMap<Vec<u8>, Vec<u8>> = self.balances.iter()
+			.map(|&(ref account, balance)| (account.to_keyed_vec(b"balance:"), vec![].and(&balance)))
+			.map(|(k, v)| (blake2_256(&k[..])[..].to_vec(), v.to_vec()))
+			.chain(vec![
+				(well_known_keys::CODE.into(), wasm_runtime),
+				(
+					well_known_keys::HEAP_PAGES.into(),
+					vec![].and(&(self.heap_pages_override.unwrap_or(16 as u64))),
+				),
+			].into_iter())
+			.collect();
+		if let Some(ref changes_trie_config) = self.changes_trie_config {
+			map.insert(well_known_keys::CHANGES_TRIE_CONFIG.to_vec(), changes_trie_config.encode());
+		}
+		// Add the extra storage entries.
+		map.extend(self.extra_storage.top.clone().into_iter());
+
+		// Assimilate the system genesis config.
+		let mut storage = Storage { top: map, children: self.extra_storage.children.clone()};
+		let config = crate::GenesisConfig {
+            system: None,
+            babe: None,
+            indices: None,
+            balances: None,
+            staking: None,
+            session: None,
+            grandpa: None,
+            claims: None,
+            parachains: None,
+            registrar: None,
+            vesting: None,
+        };
+		config.assimilate_storage(&mut storage).expect("Adding `system::GensisConfig` to the genesis");
+
+		storage
+	}
+}
+
+pub fn insert_genesis_block(
+	storage: &mut Storage,
+) -> sp_core::hash::H256 {
+	let child_roots = storage.children.iter().map(|(sk, child_content)| {
+		let state_root = <<<crate::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+			child_content.data.clone().into_iter().collect(),
+		);
+		(sk.clone(), state_root.encode())
+	});
+	// add child roots to storage
+	storage.top.extend(child_roots);
+	let state_root = <<<crate::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+		storage.top.clone().into_iter().collect()
+	);
+	let block: crate::Block = sc_client::genesis::construct_genesis_block(state_root);
+	let genesis_hash = block.header.hash();
+	storage.top.extend(additional_storage_with_genesis(&block));
+	genesis_hash
+}
+
+pub fn additional_storage_with_genesis(genesis_block: &crate::Block) -> BTreeMap<Vec<u8>, Vec<u8>> {
+	map![
+		twox_128(&b"latest"[..]).to_vec() => genesis_block.hash().as_fixed_bytes().to_vec()
+	]
+}

runtime/test-runtime/src/lib.rs

@@ -66,6 +66,8 @@ pub use parachains::Call as ParachainsCall;
 
 /// Constant values used within the runtime.
 pub mod constants;
+#[cfg(feature = "std")]
+pub mod genesismap;
 use constants::{time::*, currency::*, fee::*};
 
 // Make the WASM binary available.