pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 19:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make network_config_path an Option (#5661)

Browse Source 
* Make network_config_path an Option

* Fix network tests

* Use None as the network config path

* Fix cli

* Don't make PathBuf an Option in a cli context
This commit is contained in:
Ashley
2020-04-17 14:48:45 +02:00
committed by GitHub
parent 249a92aece
commit 95dc400bb8
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/cli/src/commands/mod.rs
+1 -1
View File
@@ -173,7 +173,7 @@ macro_rules! substrate_cli_subcommands {
&self,
chain_spec: &::std::boxed::Box<dyn ::sc_service::ChainSpec>,
is_dev: bool,
net_config_dir: &::std::path::PathBuf,
net_config_dir: ::std::path::PathBuf,
client_id: &str,
node_name: &str,
node_key: ::sc_service::config::NodeKeyConfig,
substrate/client/cli/src/config.rs
+4 -4
View File
@@ -110,7 +110,7 @@ pub trait CliConfiguration: Sized {
&self,
chain_spec: &Box<dyn ChainSpec>,
is_dev: bool,
net_config_dir: &PathBuf,
net_config_dir: PathBuf,
client_id: &str,
node_name: &str,
node_key: NodeKeyConfig,
@@ -119,7 +119,7 @@ pub trait CliConfiguration: Sized {
network_params.network_config(
chain_spec,
is_dev,
net_config_dir,
Some(net_config_dir),
client_id,
node_name,
node_key,
@@ -129,7 +129,7 @@ pub trait CliConfiguration: Sized {
node_name,
client_id,
node_key,
net_config_dir,
Some(net_config_dir),
)
})
}
@@ -405,7 +405,7 @@ pub trait CliConfiguration: Sized {
network: self.network_config(
&chain_spec,
is_dev,
&net_config_dir,
net_config_dir,
client_id.as_str(),
self.node_name()?.as_str(),
node_key,
substrate/client/cli/src/params/network_params.rs
+2 -2
View File
@@ -96,7 +96,7 @@ impl NetworkParams {
&self,
chain_spec: &Box<dyn ChainSpec>,
is_dev: bool,
net_config_path: &PathBuf,
net_config_path: Option<PathBuf>,
client_id: &str,
node_name: &str,
node_key: NodeKeyConfig,
@@ -121,7 +121,7 @@ impl NetworkParams {
NetworkConfiguration {
boot_nodes,
net_config_path: net_config_path.clone(),
net_config_path,
reserved_nodes: self.reserved_nodes.clone(),
non_reserved_mode: if self.reserved_only {
NonReservedPeerMode::Deny