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

Splitting relaychain and parachain command-line arguments (#42)

Browse Source 
Fixes #34

Added .editorconfig
This commit is contained in:
Cecile Tonglet
2020-01-28 10:00:45 +01:00
committed by GitHub
parent 5f60c91476
commit 4cde05739b
5 changed files with 541 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/test/parachain/src/cli.rs
+24 -10
View File
@@ -30,6 +30,8 @@ use sp_runtime::{
traits::{Block as BlockT, Hash as HashT, Header as HeaderT},
BuildStorage,
};
use polkadot_service::ChainSpec as ChainSpecPolkadot;
use polkadot_service::CustomConfiguration as CustomConfigurationPolkadot;
use futures::{channel::oneshot, future::Map, FutureExt};
@@ -64,17 +66,18 @@ struct ExportGenesisStateCommand {
}
/// Parse command line arguments into service configuration.
pub fn run<I, T, E>(args: I, exit: E, version: VersionInfo) -> error::Result<()>
pub fn run<I, T, E>(args_parachain: I, args_relaychain: I, exit: E, version: VersionInfo) -> error::Result<()>
where
I: IntoIterator<Item = T>,
T: Into<std::ffi::OsString> + Clone,
E: IntoExit + Send + 'static,
{
type Config<T> = Configuration<(), T>;
match parse_and_prepare::<SubCommands, NoCustom, _>(
&version,
"cumulus-test-parachain-collator",
args,
args_parachain,
) {
ParseAndPrepare::Run(cmd) => cmd.run(
load_spec,
@@ -94,14 +97,19 @@ where
// TODO
config.network.listen_addresses = Vec::new();
// TODO
let mut polkadot_config =
polkadot_collator::Configuration::default_with_spec_and_base_path(
polkadot_service::ChainSpec::from_json_bytes(
&include_bytes!("../res/polkadot_chainspec.json")[..],
)?,
config.in_chain_config_dir("polkadot"),
);
let mut polkadot_config = parse_and_prepare::<NoCustom, NoCustom, _>(
&version,
"cumulus-test-parachain-collator",
args_relaychain,
).into_configuration::<CustomConfigurationPolkadot, _, _, _>(
load_spec_polkadot,
config.in_chain_config_dir("polkadot"),
)
.map_err(|e| e.to_string())?
.expect(
"can only fail when this is a CustomCommand. Running parse_and_prepare with \
NoCustom can never return a CustomCommand; therefore this will never fail; qed"
);
polkadot_config.network.boot_nodes = config.network.boot_nodes.clone();
if let Some(ref config_dir) = polkadot_config.config_dir {
@@ -155,6 +163,12 @@ fn load_spec(_: &str) -> std::result::Result<Option<chain_spec::ChainSpec>, Stri
Ok(Some(chain_spec::get_chain_spec()))
}
fn load_spec_polkadot(_: &str) -> std::result::Result<Option<ChainSpecPolkadot>, String> {
Some(polkadot_service::ChainSpec::from_json_bytes(
&include_bytes!("../res/polkadot_chainspec.json")[..],
)).transpose()
}
/// Export the genesis state of the parachain.
fn export_genesis_state(output: Option<PathBuf>) -> error::Result<()> {
let storage = (&chain_spec::get_chain_spec()).build_storage()?;