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

Companion for https://github.com/paritytech/substrate/pull/12147 #1587

Merged
merged 4 commits into from
Sep 2, 2022
Merged

Companion for https://github.com/paritytech/substrate/pull/12147 #1587

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bf3030
Companion for https://github.com/paritytech/substrate/pull/12147
bkchr Sep 1, 2022
384d30a
Merge remote-tracking branch 'origin/master' into bkchr-fix-benchmark…
Sep 2, 2022
676cbe7
update lockfile for {"substrate", "polkadot"}
Sep 2, 2022
0931241
Fix tests
bkchr Sep 2, 2022
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
2 changes: 1 addition & 1 deletion parachain-template/node/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ impl CliConfiguration<Self> for RelayChainCli {
fn base_path(&self) -> Result<Option<BasePath>> {
Ok(self
.shared_params()
.base_path()
.base_path()?
.or_else(|| self.base_path.clone().map(Into::into)))
}

Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachain/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ impl CliConfiguration<Self> for RelayChainCli {
fn base_path(&self) -> Result<Option<BasePath>> {
Ok(self
.shared_params()
.base_path()
.base_path()?
.or_else(|| self.base_path.clone().map(Into::into)))
}

Expand Down
2 changes: 1 addition & 1 deletion test/service/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ impl CliConfiguration<Self> for RelayChainCli {
fn base_path(&self) -> CliResult<Option<BasePath>> {
Ok(self
.shared_params()
.base_path()
.base_path()?
.or_else(|| self.base_path.clone().map(Into::into)))
}

Expand Down