diff options
Diffstat (limited to 'src/transport/mycelium')
| -rw-r--r-- | src/transport/mycelium/daemon.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/transport/mycelium/daemon.rs b/src/transport/mycelium/daemon.rs index 80b6be5..f194fca 100644 --- a/src/transport/mycelium/daemon.rs +++ b/src/transport/mycelium/daemon.rs @@ -32,7 +32,8 @@ pub struct MyceliumSpawnConfig { pub rest_url_opt: Option<Url>, pub key_file_opt: Option<PathBuf>, pub network_key_file: Option<PathBuf>, - pub network_name: String, + /// Set together with `network_key_file` (`Settings::check`). + pub network_name: Option<String>, pub tcp_port: Option<u16>, pub peers: Vec<String>, } @@ -43,7 +44,7 @@ impl Default for MyceliumSpawnConfig { rest_url_opt: None, key_file_opt: None, network_key_file: None, - network_name: "something".to_string(), + network_name: None, tcp_port: None, peers: vec!["tls://127.0.0.1:9651".to_string()], } @@ -88,12 +89,14 @@ impl MyceliumSetup { } }; - let private_net_config = config - .network_key_file - .map(|net_key_path| PrivateNetworkConfig { - name: config.network_name.clone(), - key: KeySource::Path(net_key_path), - }); + let private_net_config = + config + .network_key_file + .zip(config.network_name) + .map(|(net_key_path, name)| PrivateNetworkConfig { + name, + key: KeySource::Path(net_key_path), + }); let supervised_node = SupervisedMycelium::spawn(key, private_net_config, config.tcp_port, &config.peers) |