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

Make network_config_path an Option #5661

Merged
bkchr merged 5 commits into from
Apr 17, 2020
Merged

Make network_config_path an Option #5661

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e06e8b9
Make network_config_path an Option
expenses Apr 16, 2020
e5a69fd
Fix network tests
expenses Apr 16, 2020
a749ba8
Use None as the network config path
expenses Apr 16, 2020
f5b740e
Fix cli
expenses Apr 16, 2020
2fc3c56
Don't make PathBuf an Option in a cli context
expenses Apr 17, 2020
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 client/cli/src/commands/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: Option<::std::path::PathBuf>,
client_id: &str,
node_name: &str,
node_key: ::sc_service::config::NodeKeyConfig,
Expand Down
4 changes: 2 additions & 2 deletions client/cli/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub trait CliConfiguration: Sized {
&self,
chain_spec: &Box<dyn ChainSpec>,
is_dev: bool,
net_config_dir: &PathBuf,
net_config_dir: Option<PathBuf>,
client_id: &str,
node_name: &str,
node_key: NodeKeyConfig,
Expand Down Expand Up @@ -405,7 +405,7 @@ pub trait CliConfiguration: Sized {
network: self.network_config(
&chain_spec,
is_dev,
&net_config_dir,
Some(net_config_dir),
client_id.as_str(),
self.node_name()?.as_str(),
node_key,
Expand Down
4 changes: 2 additions & 2 deletions client/cli/src/params/network_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,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,
Expand All @@ -117,7 +117,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
Expand Down
5 changes: 2 additions & 3 deletions client/service/test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,11 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
{
let root = root.path().join(format!("node-{}", index));

let net_config_path = root.join("network");

let mut network_config = NetworkConfiguration::new(
format!("Node {}", index),
"network/test/0.1",
Default::default(), &net_config_path,
Default::default(),
None,
);

network_config.listen_addresses.push(
Expand Down