Skip to content

Commit 7ccf00d

Browse files
author
Enddy Dumbrique
committed
lint
1 parent a08cee4 commit 7ccf00d

File tree

1 file changed

+31
-39
lines changed

1 file changed

+31
-39
lines changed

node/cli/src/command.rs

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -68,51 +68,48 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
6868
#[cfg(feature = "frequency")]
6969
"frequency" => return Ok(Box::new(chain_spec::frequency::load_frequency_spec())),
7070
#[cfg(feature = "frequency-no-relay")]
71-
"dev" | "frequency-no-relay" => {
72-
return Ok(Box::new(chain_spec::frequency_rococo::development_config()))
73-
},
71+
"dev" | "frequency-no-relay" =>
72+
return Ok(Box::new(chain_spec::frequency_rococo::development_config())),
7473
#[cfg(feature = "frequency-rococo-local")]
75-
"frequency-rococo-local" => {
76-
return Ok(Box::new(chain_spec::frequency_rococo::local_testnet_config()))
77-
},
74+
"frequency-rococo-local" =>
75+
return Ok(Box::new(chain_spec::frequency_rococo::local_testnet_config())),
7876
#[cfg(feature = "frequency-rococo-testnet")]
79-
"frequency-rococo-testnet" | "frequency-rococo" | "rococo" | "testnet" => {
80-
return Ok(Box::new(chain_spec::frequency_rococo::load_frequency_rococo_spec()))
81-
},
77+
"frequency-rococo-testnet" | "frequency-rococo" | "rococo" | "testnet" =>
78+
return Ok(Box::new(chain_spec::frequency_rococo::load_frequency_rococo_spec())),
8279
path => {
8380
if path.is_empty() {
8481
if cfg!(feature = "frequency") {
8582
#[cfg(feature = "frequency")]
8683
{
87-
return Ok(Box::new(chain_spec::frequency::load_frequency_spec()));
84+
return Ok(Box::new(chain_spec::frequency::load_frequency_spec()))
8885
}
8986
#[cfg(not(feature = "frequency"))]
90-
return Err("Frequency runtime is not available.".into());
87+
return Err("Frequency runtime is not available.".into())
9188
} else if cfg!(feature = "frequency-no-relay") {
9289
#[cfg(feature = "frequency-no-relay")]
9390
{
94-
return Ok(Box::new(chain_spec::frequency_rococo::development_config()));
91+
return Ok(Box::new(chain_spec::frequency_rococo::development_config()))
9592
}
9693
#[cfg(not(feature = "frequency-no-relay"))]
97-
return Err("Frequency Development (no relay) runtime is not available.".into());
94+
return Err("Frequency Development (no relay) runtime is not available.".into())
9895
} else if cfg!(feature = "frequency-rococo-local") {
9996
#[cfg(feature = "frequency-rococo-local")]
10097
{
101-
return Ok(Box::new(chain_spec::frequency_rococo::local_testnet_config()));
98+
return Ok(Box::new(chain_spec::frequency_rococo::local_testnet_config()))
10299
}
103100
#[cfg(not(feature = "frequency-rococo-local"))]
104-
return Err("Frequency Local runtime is not available.".into());
101+
return Err("Frequency Local runtime is not available.".into())
105102
} else if cfg!(feature = "frequency-rococo-testnet") {
106103
#[cfg(feature = "frequency-rococo-testnet")]
107104
{
108105
return Ok(Box::new(
109106
chain_spec::frequency_rococo::load_frequency_rococo_spec(),
110-
));
107+
))
111108
}
112109
#[cfg(not(feature = "frequency-rococo-testnet"))]
113-
return Err("Frequency Rococo runtime is not available.".into());
110+
return Err("Frequency Rococo runtime is not available.".into())
114111
} else {
115-
return Err("No chain spec is available.".into());
112+
return Err("No chain spec is available.".into())
116113
}
117114
}
118115
let path_buf = std::path::PathBuf::from(path);
@@ -121,41 +118,39 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
121118
if ChainIdentity::Frequency == spec.identify() {
122119
#[cfg(feature = "frequency")]
123120
{
124-
return Ok(Box::new(chain_spec::frequency::ChainSpec::from_json_file(
125-
path_buf,
126-
)?));
121+
return Ok(Box::new(chain_spec::frequency::ChainSpec::from_json_file(path_buf)?))
127122
}
128123
#[cfg(not(feature = "frequency"))]
129-
return Err("Frequency runtime is not available.".into());
124+
return Err("Frequency runtime is not available.".into())
130125
} else if ChainIdentity::FrequencyRococo == spec.identify() {
131126
#[cfg(feature = "frequency-rococo-testnet")]
132127
{
133128
return Ok(Box::new(chain_spec::frequency_rococo::ChainSpec::from_json_file(
134129
path_buf,
135-
)?));
130+
)?))
136131
}
137132
#[cfg(not(feature = "frequency-rococo-testnet"))]
138-
return Err("Frequency Rococo runtime is not available.".into());
133+
return Err("Frequency Rococo runtime is not available.".into())
139134
} else if ChainIdentity::FrequencyLocal == spec.identify() {
140135
#[cfg(feature = "frequency-rococo-local")]
141136
{
142137
return Ok(Box::new(chain_spec::frequency_rococo::ChainSpec::from_json_file(
143138
path_buf,
144-
)?));
139+
)?))
145140
}
146141
#[cfg(not(feature = "frequency-rococo-local"))]
147-
return Err("Frequency Local runtime is not available.".into());
142+
return Err("Frequency Local runtime is not available.".into())
148143
} else if ChainIdentity::FrequencyDev == spec.identify() {
149144
#[cfg(feature = "frequency-no-relay")]
150145
{
151146
return Ok(Box::new(chain_spec::frequency_rococo::ChainSpec::from_json_file(
152147
path_buf,
153-
)?));
148+
)?))
154149
}
155150
#[cfg(not(feature = "frequency-no-relay"))]
156-
return Err("Frequency Dev (no relay) runtime is not available.".into());
151+
return Err("Frequency Dev (no relay) runtime is not available.".into())
157152
} else {
158-
return Err("Unknown chain spec.".into());
153+
return Err("Unknown chain spec.".into())
159154
}
160155
},
161156
}
@@ -328,28 +323,26 @@ pub fn run() -> Result<()> {
328323
let runner = cli.create_runner(cmd)?;
329324

330325
match cmd {
331-
BenchmarkCmd::Pallet(cmd) => {
326+
BenchmarkCmd::Pallet(cmd) =>
332327
if cfg!(feature = "runtime-benchmarks") {
333328
runner.sync_run(|config| cmd.run::<Block, ()>(config))
334329
} else {
335330
return Err("Benchmarking wasn't enabled when building the node. \
336331
You can enable it with `--features runtime-benchmarks`."
337-
.into());
338-
}
339-
},
332+
.into())
333+
},
340334
BenchmarkCmd::Block(cmd) => runner.sync_run(|config| {
341335
let partials = new_partial(&config, false)?;
342336
cmd.run(partials.client)
343337
}),
344338
#[cfg(not(feature = "runtime-benchmarks"))]
345-
BenchmarkCmd::Storage(_) => {
339+
BenchmarkCmd::Storage(_) =>
346340
return Err(sc_cli::Error::Input(
347341
"Compile with --features=runtime-benchmarks \
348342
to enable storage benchmarks."
349343
.into(),
350344
)
351-
.into())
352-
},
345+
.into()),
353346
#[cfg(feature = "runtime-benchmarks")]
354347
BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {
355348
let partials = new_partial(&config, false)?;
@@ -373,9 +366,8 @@ pub fn run() -> Result<()> {
373366
BenchmarkCmd::Machine(cmd) => runner.sync_run(|config| {
374367
cmd.run(&config, frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.clone())
375368
}),
376-
BenchmarkCmd::Extrinsic(_cmd) => {
377-
Err("Benchmarking command not implemented.".into())
378-
},
369+
BenchmarkCmd::Extrinsic(_cmd) =>
370+
Err("Benchmarking command not implemented.".into()),
379371
}
380372
},
381373

0 commit comments

Comments
 (0)