Uniformize tests (#220)

* Initial commit Forked at: 5bbab68f02 Parent branch: origin/master * Copy runtime module from rococo Forked at: 5bbab68f02 Parent branch: origin/master * Also copy dependencies pallets and primitives Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * test-service * Move integration test * CLEANUP Forked at: 5bbab68f02 Parent branch: origin/master * Not sure what went wrong... * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * CLEANUP Forked at: 5bbab68f02 Parent branch: origin/master * fmt * CLEANUP Forked at: 5bbab68f02 Parent branch: origin/master * CLEANUP Forked at: 5bbab68f02 Parent branch: origin/master * Remove pallet contracts (not used) * Remove pallet parachain-info and token-dealer (not used) * Sort dependencies alphabetically * CLEANUP Forked at: 5bbab68f02 Parent branch: origin/master * CumulusTestNode for testing * Speed up block generation * Fix improper shutdown * rustfmt * runtime: replace const by storage * Fix for previous commit * Remove some generics * Move generate_genesis_state to cumulus-primitives * fmt * Remove message_example * fixup! Remove message_example * WIP Forked at: 5bbab68f02 Parent branch: origin/master * Half the solution to previous commit :( * Revert "Fix for previous commit" This reverts commit 60010bab6797487093ac8c790b3a536f7ca0895b. * Revert "runtime: replace const by storage" This reverts commit c64b3a46f0325a98922015e0cbf3570e2e431774. Not working for some reason... * Use helper Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * Remove test-primitives * Revert "Half the solution to previous commit :(" This reverts commit 9a8f89f9f06252198e6405057043c6b313f1aea4. * Revert "Revert "Half the solution to previous commit :("" This reverts commit 6a93f0f09d74ccdc3738dd78a777c483427c03ce. * Test with some extra extrinsics * WIP Forked at: 5bbab68f02 Parent branch: origin/master * CLEANUP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * WIP Forked at: 5bbab68f02 Parent branch: origin/master * CLEANUP Forked at: 5bbab68f02 Parent branch: origin/master * Remove message broker
2026-06-13 15:11:03 +00:00 · 2020-10-07 10:51:01 +02:00
parent 23a49da012
commit 4d150a0199
24 changed files with 1956 additions and 869 deletions
@@ -19,7 +19,7 @@ use crate::{
 	cli::{Cli, RelayChainCli, Subcommand},
 };
 use codec::Encode;
-use cumulus_primitives::ParaId;
+use cumulus_primitives::{genesis::generate_genesis_block, ParaId};
 use log::info;
 use parachain_runtime::Block;
 use polkadot_parachain::primitives::AccountIdConversion;
@@ -29,7 +29,7 @@ use sc_cli::{
 };
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT, Zero};
+use sp_runtime::traits::Block as BlockT;
 use std::{io::Write, net::SocketAddr, sync::Arc};

 fn load_spec(
@@ -134,34 +134,6 @@ impl SubstrateCli for RelayChainCli {
 	}
 }

-pub fn generate_genesis_state(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<Block> {
-	let storage = chain_spec.build_storage()?;
-
-	let child_roots = storage.children_default.iter().map(|(sk, child_content)| {
-		let state_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-			child_content.data.clone().into_iter().collect(),
-		);
-		(sk.clone(), state_root.encode())
-	});
-	let state_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-		storage.top.clone().into_iter().chain(child_roots).collect(),
-	);
-
-	let extrinsics_root =
-		<<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(Vec::new());
-
-	Ok(Block::new(
-		<<Block as BlockT>::Header as HeaderT>::new(
-			Zero::zero(),
-			extrinsics_root,
-			state_root,
-			Default::default(),
-			Default::default(),
-		),
-		Default::default(),
-	))
-}
-
 fn extract_genesis_wasm(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<Vec<u8>> {
 	let mut storage = chain_spec.build_storage()?;

@@ -216,7 +188,7 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::ExportGenesisState(params)) => {
 			sc_cli::init_logger("");

-			let block = generate_genesis_state(&load_spec(
+			let block: Block = generate_genesis_block(&load_spec(
 				&params.chain.clone().unwrap_or_default(),
 				params.parachain_id.into(),
 			)?)?;
@@ -268,8 +240,8 @@ pub fn run() -> Result<()> {
 				let parachain_account =
 					AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id);

-				let block =
-					generate_genesis_state(&config.chain_spec).map_err(|e| format!("{:?}", e))?;
+				let block: Block =
+					generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?;
 				let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));

 				let task_executor = config.task_executor.clone();
@@ -293,7 +265,6 @@ pub fn run() -> Result<()> {
 						polkadot_config,
 						id,
 						collator,
-						false,
 					)
 				} else {
 					crate::service::start_node(
@@ -302,7 +273,6 @@ pub fn run() -> Result<()> {
 						polkadot_config,
 						id,
 						collator,
-						false,
 					)
 					.map(|r| r.0)
 				}