Move create network folder structure to top level of start_service (#1224)

Fixes issue where the network folder is not created when run
with '--node-key' arg
This commit is contained in:
Jordan Beauchamp
2018-12-07 22:08:20 +13:00
committed by Bastian Köcher
parent ccf575454e
commit da822276dd
2 changed files with 6 additions and 2 deletions
@@ -35,8 +35,6 @@ pub fn obtain_private_key(
} else {
if let Some(ref path) = config.net_config_path {
fs::create_dir_all(Path::new(path))?;
// Try fetch the key from a the file containing the secret.
let secret_path = Path::new(path).join(SECRET_FILE);
match load_private_key_from_file(&secret_path) {
@@ -27,6 +27,7 @@ use libp2p::kad::{KadConnectionType, KadQueryEvent};
use parking_lot::Mutex;
use rand;
use secret::obtain_private_key;
use std::fs;
use std::io::{Error as IoError, ErrorKind as IoErrorKind};
use std::iter;
use std::net::SocketAddr;
@@ -52,6 +53,11 @@ pub fn start_service<TProtos>(
registered_custom: TProtos,
) -> Result<Service, Error>
where TProtos: IntoIterator<Item = RegisteredProtocol> {
if let Some(ref path) = config.net_config_path {
fs::create_dir_all(Path::new(path))?;
}
// Private and public keys configuration.
let local_private_key = obtain_private_key(&config)?;
let local_public_key = local_private_key.to_public_key();