Skip to content

Commit 4dca185

Browse files
author
Ayush
committed
improve formatting
1 parent 3368f5e commit 4dca185

File tree

58 files changed

+501
-547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+501
-547
lines changed

‎node/src/cli.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ impl RelayChainCli {
111111
) -> Self {
112112
let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec);
113113
let chain_id = extension.map(|e| e.relay_chain.clone());
114-
let base_path = para_config
115-
.base_path
116-
.as_ref()
117-
.map(|x| x.path().join("polkadot"));
114+
let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot"));
118115
Self {
119116
base_path,
120117
chain_id,

‎node/src/command.rs‎

Lines changed: 64 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
use crate::{
22
chain_spec,
3-
cli::{Cli, RelayChainCli, Subcommand},
4-
service::{new_partial, DataHighwayRuntimeExecutor}
3+
cli::{
4+
Cli,
5+
RelayChainCli,
6+
Subcommand,
7+
},
8+
service::{
9+
new_partial,
10+
DataHighwayRuntimeExecutor,
11+
},
512
};
6-
use datahighway_runtime::RuntimeApi;
713
use codec::Encode;
814
use cumulus_client_service::genesis::generate_genesis_block;
915
use cumulus_primitives_core::ParaId;
10-
use datahighway_runtime::Block;
16+
use datahighway_runtime::{
17+
Block,
18+
RuntimeApi,
19+
};
1120
use log::info;
1221
use polkadot_parachain::primitives::AccountIdConversion;
1322
use sc_cli::{
@@ -160,48 +169,39 @@ pub fn run() -> Result<()> {
160169
}
161170
Some(Subcommand::CheckBlock(cmd)) => {
162171
construct_async_run!(|components, cli, cmd, config| {
163-
Ok(cmd.run(components.client, components.import_queue))
164-
})
172+
Ok(cmd.run(components.client, components.import_queue))
173+
})
165174
}
166175
Some(Subcommand::ExportBlocks(cmd)) => {
167-
construct_async_run!(|components, cli, cmd, config| {
168-
Ok(cmd.run(components.client, config.database))
169-
})
176+
construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, config.database)) })
170177
}
171178
Some(Subcommand::ExportState(cmd)) => {
172-
construct_async_run!(|components, cli, cmd, config| {
173-
Ok(cmd.run(components.client, config.chain_spec))
174-
})
179+
construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, config.chain_spec)) })
175180
}
176181
Some(Subcommand::ImportBlocks(cmd)) => {
177182
construct_async_run!(|components, cli, cmd, config| {
178-
Ok(cmd.run(components.client, components.import_queue))
179-
})
183+
Ok(cmd.run(components.client, components.import_queue))
184+
})
180185
}
181186
Some(Subcommand::PurgeChain(cmd)) => {
182187
let runner = cli.create_runner(cmd)?;
183188

184189
runner.sync_run(|config| {
185190
let polkadot_cli = RelayChainCli::new(
186191
&config,
187-
[RelayChainCli::executable_name().to_string()]
188-
.iter()
189-
.chain(cli.relaychain_args.iter()),
192+
[RelayChainCli::executable_name().to_string()].iter().chain(cli.relaychain_args.iter()),
190193
);
191194

192-
let polkadot_config = SubstrateCli::create_configuration(
193-
&polkadot_cli,
194-
&polkadot_cli,
195-
config.task_executor.clone(),
196-
)
197-
.map_err(|err| format!("Relay chain argument error: {}", err))?;
195+
let polkadot_config =
196+
SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, config.task_executor.clone())
197+
.map_err(|err| format!("Relay chain argument error: {}", err))?;
198198

199199
cmd.run(config, polkadot_config)
200200
})
201201
}
202-
Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| {
203-
Ok(cmd.run(components.client, components.backend))
204-
}),
202+
Some(Subcommand::Revert(cmd)) => {
203+
construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, components.backend)) })
204+
}
205205
Some(Subcommand::ExportGenesisState(params)) => {
206206
let mut builder = sc_cli::LoggerBuilder::new("");
207207
builder.with_profiling(sc_tracing::TracingReceiver::Log, "");
@@ -249,50 +249,42 @@ pub fn run() -> Result<()> {
249249
None => {
250250
let runner = cli.create_runner(&cli.run.normalize())?;
251251

252-
runner.run_node_until_exit(|config| async move {
253-
let para_id =
254-
chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id);
255-
256-
let polkadot_cli = RelayChainCli::new(
257-
&config,
258-
[RelayChainCli::executable_name().to_string()]
259-
.iter()
260-
.chain(cli.relaychain_args.iter()),
261-
);
262-
263-
let id = ParaId::from(cli.run.parachain_id.or(para_id).unwrap_or(2000));
264-
265-
let parachain_account =
266-
AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id);
267-
268-
let block: Block =
269-
generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?;
270-
let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
271-
272-
let task_executor = config.task_executor.clone();
273-
let polkadot_config = SubstrateCli::create_configuration(
274-
&polkadot_cli,
275-
&polkadot_cli,
276-
task_executor,
277-
)
278-
.map_err(|err| format!("Relay chain argument error: {}", err))?;
279-
280-
info!("Parachain id: {:?}", id);
281-
info!("Parachain Account: {}", parachain_account);
282-
info!("Parachain genesis state: {}", genesis_state);
283-
info!(
284-
"Is collating: {}",
285-
if config.role.is_authority() {
286-
"yes"
287-
} else {
288-
"no"
289-
}
290-
);
291-
292-
crate::service::start_node(config, polkadot_config, id)
293-
.await
294-
.map(|r| r.0)
295-
.map_err(Into::into)
252+
runner.run_node_until_exit(|config| {
253+
async move {
254+
let para_id = chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id);
255+
256+
let polkadot_cli = RelayChainCli::new(
257+
&config,
258+
[RelayChainCli::executable_name().to_string()].iter().chain(cli.relaychain_args.iter()),
259+
);
260+
261+
let id = ParaId::from(cli.run.parachain_id.or(para_id).unwrap_or(2000));
262+
263+
let parachain_account =
264+
AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id);
265+
266+
let block: Block = generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?;
267+
let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
268+
269+
let task_executor = config.task_executor.clone();
270+
let polkadot_config =
271+
SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor)
272+
.map_err(|err| format!("Relay chain argument error: {}", err))?;
273+
274+
info!("Parachain id: {:?}", id);
275+
info!("Parachain Account: {}", parachain_account);
276+
info!("Parachain genesis state: {}", genesis_state);
277+
info!(
278+
"Is collating: {}",
279+
if config.role.is_authority() {
280+
"yes"
281+
} else {
282+
"no"
283+
}
284+
);
285+
286+
crate::service::start_node(config, polkadot_config, id).await.map(|r| r.0).map_err(Into::into)
287+
}
296288
})
297289
}
298290
}
@@ -354,8 +346,8 @@ impl CliConfiguration<Self> for RelayChainCli {
354346
}
355347

356348
fn init<C: SubstrateCli>(&self) -> Result<()> {
357-
unreachable!("PolkadotCli is never initialized; qed");
358-
}
349+
unreachable!("PolkadotCli is never initialized; qed");
350+
}
359351

360352
fn chain_id(&self, is_dev: bool) -> Result<String> {
361353
let chain_id = self.base.base.chain_id(is_dev)?;

0 commit comments

Comments
 (0)