mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-24 10:05:48 +00:00
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:
committed by
Bastian Köcher
parent
ccf575454e
commit
da822276dd
@@ -35,8 +35,6 @@ pub fn obtain_private_key(
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
if let Some(ref path) = config.net_config_path {
|
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.
|
// Try fetch the key from a the file containing the secret.
|
||||||
let secret_path = Path::new(path).join(SECRET_FILE);
|
let secret_path = Path::new(path).join(SECRET_FILE);
|
||||||
match load_private_key_from_file(&secret_path) {
|
match load_private_key_from_file(&secret_path) {
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ use libp2p::kad::{KadConnectionType, KadQueryEvent};
|
|||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use rand;
|
use rand;
|
||||||
use secret::obtain_private_key;
|
use secret::obtain_private_key;
|
||||||
|
use std::fs;
|
||||||
use std::io::{Error as IoError, ErrorKind as IoErrorKind};
|
use std::io::{Error as IoError, ErrorKind as IoErrorKind};
|
||||||
use std::iter;
|
use std::iter;
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
@@ -52,6 +53,11 @@ pub fn start_service<TProtos>(
|
|||||||
registered_custom: TProtos,
|
registered_custom: TProtos,
|
||||||
) -> Result<Service, Error>
|
) -> Result<Service, Error>
|
||||||
where TProtos: IntoIterator<Item = RegisteredProtocol> {
|
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.
|
// Private and public keys configuration.
|
||||||
let local_private_key = obtain_private_key(&config)?;
|
let local_private_key = obtain_private_key(&config)?;
|
||||||
let local_public_key = local_private_key.to_public_key();
|
let local_public_key = local_private_key.to_public_key();
|
||||||
|
|||||||
Reference in New Issue
Block a user