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

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

* update lockfile for {"substrate", "polkadot"}

* Fix tests

Co-authored-by: parity-processbot <>

parachain-template/node/src/command.rs

@@ -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)))
 	}