Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Remove ServiceBuilderCommand and implement the chain ops as standalone functions instead. #6543

Merged
merged 14 commits into from
Jul 2, 2020
Merged

Remove ServiceBuilderCommand and implement the chain ops as standalone functions instead. #6543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
869b70c
:)
expenses Jun 30, 2020
31c65a6
Slight tidy
expenses Jun 30, 2020
6ad0d79
Remove ServiceBuilderCommand
expenses Jun 30, 2020
b7399d6
Remove whitespace
expenses Jun 30, 2020
746186d
Merge remote-tracking branch 'parity/master' into ashley-chainops
expenses Jul 1, 2020
4db2f17
Merge branch 'ashley-chainops' of github.com:paritytech/substrate int…
expenses Jul 1, 2020
4020ff4
Keep task manager alive for check_block/import_blocks
expenses Jul 1, 2020
23c6f29
Pass task_manager to run_until_exit
expenses Jul 1, 2020
67a4c03
Make task_manager in run_until_exit and make subcommands async
expenses Jul 1, 2020
1451d5c
Merge remote-tracking branch 'parity/master' into ashley-chainops
expenses Jul 1, 2020
d1a935a
Change the async_run fn to return a future and task manager
expenses Jul 2, 2020
0d7cbce
async_run should take a result fn
expenses Jul 2, 2020
dbe52b1
Apply suggestions from code review
expenses Jul 2, 2020
9384642
Fix spaces in export_raw_state
expenses Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions client/cli/src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ impl<C: SubstrateCli> Runner<C> {
-> Result<()>
where
BU: FnOnce(Configuration)
-> sc_service::error::Result<(Arc<CL>, Arc<BA>, IQ)>,
-> sc_service::error::Result<(Arc<CL>, Arc<BA>, IQ, TaskManager)>,
B: BlockT + for<'de> serde::Deserialize<'de>,
BA: sc_client_api::backend::Backend<B> + 'static,
IQ: sc_service::ImportQueue<B> + 'static,
Expand All @@ -195,24 +195,24 @@ impl<C: SubstrateCli> Runner<C> {
match subcommand {
Subcommand::BuildSpec(cmd) => cmd.run(chain_spec, network_config),
Subcommand::ExportBlocks(cmd) => {
let (client, _, _) = builder(self.config)?;
let (client, _, _, _) = builder(self.config)?;
run_until_exit(self.tokio_runtime, cmd.run(client, db_config))
}
Subcommand::ImportBlocks(cmd) => {
let (client, _, import_queue) = builder(self.config)?;
let (client, _, import_queue, _task_manager) = builder(self.config)?;
cecton marked this conversation as resolved.
Show resolved Hide resolved
run_until_exit(self.tokio_runtime, cmd.run(client, import_queue))
}
Subcommand::CheckBlock(cmd) => {
let (client, _, import_queue) = builder(self.config)?;
let (client, _, import_queue, _task_manager) = builder(self.config)?;
run_until_exit(self.tokio_runtime, cmd.run(client, import_queue))
}
Subcommand::Revert(cmd) => {
let (client, backend, _) = builder(self.config)?;
let (client, backend, _, _) = builder(self.config)?;
cmd.run(client, backend)
},
Subcommand::PurgeChain(cmd) => cmd.run(db_config),
Subcommand::ExportState(cmd) => {
let (client, _, _) = builder(self.config)?;
let (client, _, _, _) = builder(self.config)?;
cmd.run(client, chain_spec)
},
}
Expand Down
4 changes: 2 additions & 2 deletions client/service/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,8 @@ impl<TBl, TRtApi, TCl, TFchr, TSc, TImpQu, TFprb, TFpp, TExPool, TRpc, Backend>
}

/// Consume the builder and return the parts needed for chain operations.
pub fn to_chain_ops_parts(self) -> (Arc<TCl>, Arc<Backend>, TImpQu) {
(self.client, self.backend, self.import_queue)
pub fn to_chain_ops_parts(self) -> (Arc<TCl>, Arc<Backend>, TImpQu, TaskManager) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add a special method for this?

What happens if I require more next week? Maybe the tx pool? Can we not just call build add take what we need?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The import queue gets consumed in build, so we need to get it out before that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method is only temporary, and will only be here until I remove the service builder.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay 👍

(self.client, self.backend, self.import_queue, self.task_manager)
}

/// Defines which head-of-chain strategy to use.
Expand Down