From c05cc7b15c2f0d5d5f414f5cb09de22b1fb11cbc Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Thu, 6 Jun 2024 16:02:00 +0100 Subject: [PATCH] Added a node name to init so we can run multiple nodes with stable identifiers --- side-node/src/cli/mod.rs | 2 +- side-node/src/init/config.rs | 3 ++- side-node/src/init/keys.rs | 2 +- side-node/src/init/mod.rs | 4 ++-- side-node/src/main.rs | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/side-node/src/cli/mod.rs b/side-node/src/cli/mod.rs index af86603..07f019e 100644 --- a/side-node/src/cli/mod.rs +++ b/side-node/src/cli/mod.rs @@ -21,5 +21,5 @@ pub(crate) enum Commands { Run {}, /// initializes the Side Node with a new keypair - Init {}, + Init { name: String }, } diff --git a/side-node/src/init/config.rs b/side-node/src/init/config.rs index ffab09a..b771f38 100644 --- a/side-node/src/init/config.rs +++ b/side-node/src/init/config.rs @@ -10,10 +10,11 @@ pub(crate) struct SideNodeConfig { pub(crate) name: String, } -pub(crate) fn write_config_to_file( +pub(crate) fn write( config: &SideNodeConfig, file_path: &PathBuf, ) -> Result<(), Box> { + println!("Writing config to: {:?}", file_path); let toml_string = to_string(config)?; let mut file = File::create(file_path)?; file.write_all(toml_string.as_bytes())?; diff --git a/side-node/src/init/keys.rs b/side-node/src/init/keys.rs index 3ad0e0c..0ecfc3a 100644 --- a/side-node/src/init/keys.rs +++ b/side-node/src/init/keys.rs @@ -13,7 +13,7 @@ pub(crate) fn setup() -> String { } /// Writes a PEM-encoded string to a file at key_path. -pub(crate) fn write_pem(key_path: PathBuf, pem: String) -> Result<(), std::io::Error> { +pub(crate) fn write(key_path: PathBuf, pem: String) -> Result<(), std::io::Error> { println!("Writing key to: {:?}", key_path); let mut file = File::create(key_path)?; file.write(pem.to_string().as_bytes())?; diff --git a/side-node/src/init/mod.rs b/side-node/src/init/mod.rs index d5175da..5df7908 100644 --- a/side-node/src/init/mod.rs +++ b/side-node/src/init/mod.rs @@ -13,9 +13,9 @@ pub(crate) fn init(home: PathBuf, config: SideNodeConfig) -> Result<(), std::io: let (key_path, config_path) = side_paths(home.clone()); let pem = keys::setup(); - keys::write_pem(key_path, pem)?; + keys::write(key_path, pem)?; - config::write_config_to_file(&config, &config_path).expect("unable to write config file"); + config::write(&config, &config_path).expect("unable to write config file"); Ok(()) } diff --git a/side-node/src/main.rs b/side-node/src/main.rs index 876f168..31b1929 100644 --- a/side-node/src/main.rs +++ b/side-node/src/main.rs @@ -10,9 +10,9 @@ async fn main() { let args = parse_args(); match &args.command { - Some(Commands::Init {}) => { + Some(Commands::Init { name }) => { let config = init::config::SideNodeConfig { - name: "alice".to_string(), + name: name.to_string(), }; let _ = init::init(home(), config);