Make network_config_path an Option (#5661)

* 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
+5 -5
View File
@@ -315,7 +315,7 @@ impl From<multiaddr::Error> for ParseErr {
#[derive(Clone, Debug)]
pub struct NetworkConfiguration {
/// Directory path to store network-specific configuration. None means nothing will be saved.
pub net_config_path: PathBuf,
pub net_config_path: Option<PathBuf>,
/// Multiaddresses to listen for incoming connections.
pub listen_addresses: Vec<Multiaddr>,
/// Multiaddresses to advertise. Detected automatically if empty.
@@ -351,10 +351,10 @@ impl NetworkConfiguration {
node_name: SN,
client_version: SV,
node_key: NodeKeyConfig,
net_config_path: &PathBuf,
net_config_path: Option<PathBuf>,
) -> Self {
NetworkConfiguration {
net_config_path: net_config_path.clone(),
net_config_path,
listen_addresses: Vec::new(),
public_addresses: Vec::new(),
boot_nodes: Vec::new(),
@@ -384,7 +384,7 @@ impl NetworkConfiguration {
"test-node",
"test-client",
Default::default(),
&std::env::current_dir().expect("current directory must exist"),
None,
);
config.listen_addresses = vec![
@@ -402,7 +402,7 @@ impl NetworkConfiguration {
"test-node",
"test-client",
Default::default(),
&std::env::current_dir().expect("current directory must exist"),
None,
);
config.listen_addresses = vec![