pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 08:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

adder-collator cli flags (#2051)

Browse Source 
* Accept --parachain-id in adder-collator

* adder-collator: Support a file chainspec

This change is to make it more similar to what we have in cumlus.
This commit is contained in:
Sergei Shulepov
2020-12-01 19:20:20 +01:00
committed by GitHub
parent e8c43576d4
commit 917a5cce62
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/parachain/test-parachains/adder/collator/src/cli.rs
+8 -1
View File
@@ -45,6 +45,10 @@ pub struct RunCmd {
#[allow(missing_docs)] #[allow(missing_docs)]
#[structopt(flatten)] #[structopt(flatten)]
pub base: sc_cli::RunCmd, pub base: sc_cli::RunCmd,
/// Id of the parachain this collator collates for.
#[structopt(long)]
pub parachain_id: Option<u32>,
} }
#[allow(missing_docs)] #[allow(missing_docs)]
@@ -96,7 +100,10 @@ impl SubstrateCli for Cli {
Box::new(polkadot_service::chain_spec::rococo_local_testnet_config()?) Box::new(polkadot_service::chain_spec::rococo_local_testnet_config()?)
} }
"rococo" => Box::new(polkadot_service::chain_spec::rococo_config()?), "rococo" => Box::new(polkadot_service::chain_spec::rococo_config()?),
_ => Err("adder collator only supports rococo")?, path => {
let path = std::path::PathBuf::from(path);
Box::new(polkadot_service::RococoChainSpec::from_json_file(path)?)
}
}) })
} }
polkadot/parachain/test-parachains/adder/collator/src/main.rs
+7 -4
View File
@@ -23,7 +23,8 @@ use sc_cli::{Result, Role, SubstrateCli};
use sp_core::hexdisplay::HexDisplay; use sp_core::hexdisplay::HexDisplay;
use test_parachain_adder_collator::Collator; use test_parachain_adder_collator::Collator;
const PARA_ID: ParaId = ParaId::new(100); /// The parachain ID to collate for in case it wasn't set explicitly through CLI.
const DEFAULT_PARA_ID: ParaId = ParaId::new(100);
mod cli; mod cli;
use cli::Cli; use cli::Cli;
@@ -69,21 +70,23 @@ fn main() -> Result<()> {
let validation_code_hex = let validation_code_hex =
format!("0x{:?}", HexDisplay::from(&collator.validation_code())); format!("0x{:?}", HexDisplay::from(&collator.validation_code()));
log::info!("Running adder collator for parachain id: {}", PARA_ID); let para_id = cli.run.parachain_id.map(ParaId::from).unwrap_or(DEFAULT_PARA_ID);
log::info!("Running adder collator for parachain id: {}", para_id);
log::info!("Genesis state: {}", genesis_head_hex); log::info!("Genesis state: {}", genesis_head_hex);
log::info!("Validation code: {}", validation_code_hex); log::info!("Validation code: {}", validation_code_hex);
let config = CollationGenerationConfig { let config = CollationGenerationConfig {
key: collator.collator_key(), key: collator.collator_key(),
collator: collator.create_collation_function(), collator: collator.create_collation_function(),
para_id: PARA_ID, para_id,
}; };
overseer_handler overseer_handler
.send_msg(CollationGenerationMessage::Initialize(config)) .send_msg(CollationGenerationMessage::Initialize(config))
.await; .await;
overseer_handler overseer_handler
.send_msg(CollatorProtocolMessage::CollateOn(PARA_ID)) .send_msg(CollatorProtocolMessage::CollateOn(para_id))
.await; .await;
Ok(full_node.task_manager) Ok(full_node.task_manager)