Skip to content

Commit 9db9b4e

Browse files
authored
Merge pull request #521 from subspace/extrac-force-use-parity-db
Extract a small helper function `force_use_parity_db`
2 parents 2729d61 + 66c22fe commit 9db9b4e

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

crates/subspace-node/src/bin/subspace-node.rs

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use frame_benchmarking_cli::BenchmarkCmd;
2020
use futures::future::TryFutureExt;
2121
use futures::StreamExt;
22-
use sc_cli::{ChainSpec, CliConfiguration, Database, SubstrateCli};
22+
use sc_cli::{ChainSpec, CliConfiguration, Database, RunCmd, SubstrateCli};
2323
use sc_service::PartialComponents;
2424
use sp_core::crypto::Ss58AddressFormat;
2525
use std::any::TypeId;
@@ -73,14 +73,18 @@ fn set_default_ss58_version<C: AsRef<dyn ChainSpec>>(chain_spec: C) {
7373
}
7474
}
7575

76-
fn main() -> Result<(), Error> {
77-
let mut cli = Cli::from_args();
78-
79-
cli.run
80-
.import_params
76+
// TODO: Remove once paritydb is the default option, ref https://github.com/paritytech/substrate/pull/11537
77+
fn force_use_parity_db(run: &mut RunCmd) {
78+
run.import_params
8179
.database_params
8280
.database
8381
.replace(Database::ParityDb);
82+
}
83+
84+
fn main() -> Result<(), Error> {
85+
let mut cli = Cli::from_args();
86+
87+
force_use_parity_db(&mut cli.run);
8488

8589
match &cli.subcommand {
8690
Some(Subcommand::Key(cmd)) => cmd.run(&cli)?,
@@ -219,12 +223,7 @@ fn main() -> Result<(), Error> {
219223
})?,
220224
cli.secondary_chain_args.iter(),
221225
);
222-
secondary_chain_cli
223-
.run
224-
.import_params
225-
.database_params
226-
.database
227-
.replace(Database::ParityDb);
226+
force_use_parity_db(&mut secondary_chain_cli.run);
228227

229228
let secondary_chain_config = SubstrateCli::create_configuration(
230229
&secondary_chain_cli,
@@ -370,12 +369,7 @@ fn main() -> Result<(), Error> {
370369
})?,
371370
cli.secondary_chain_args.iter(),
372371
);
373-
secondary_chain_cli
374-
.run
375-
.import_params
376-
.database_params
377-
.database
378-
.replace(Database::ParityDb);
372+
force_use_parity_db(&mut secondary_chain_cli.run);
379373

380374
let secondary_chain_config = SubstrateCli::create_configuration(
381375
&secondary_chain_cli,

0 commit comments

Comments
 (0)