From ecec883f9b79145d62551d93dca65a232be0b81a Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Tue, 18 Jun 2024 16:35:56 +0100 Subject: [PATCH] Renamed keys module --- side-node/src/{keys.rs => bft_crdt_keys.rs} | 0 side-node/src/init/mod.rs | 4 ++-- side-node/src/lib.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename side-node/src/{keys.rs => bft_crdt_keys.rs} (100%) diff --git a/side-node/src/keys.rs b/side-node/src/bft_crdt_keys.rs similarity index 100% rename from side-node/src/keys.rs rename to side-node/src/bft_crdt_keys.rs diff --git a/side-node/src/init/mod.rs b/side-node/src/init/mod.rs index bdbd3b5..ab0457a 100644 --- a/side-node/src/init/mod.rs +++ b/side-node/src/init/mod.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; use config::SideNodeConfig; -use crate::{bitcoin_keys, keys, utils}; +use crate::{bft_crdt_keys, bitcoin_keys, utils}; pub(crate) mod config; @@ -11,7 +11,7 @@ pub(crate) fn init(home: PathBuf, config: SideNodeConfig) -> Result<(), std::io: let (bft_crdt_key_path, bitcoin_key_path, config_path) = utils::side_paths(home.clone()); println!("Writing bft crdt key to: {:?}", bft_crdt_key_path); - keys::write(&bft_crdt_key_path)?; + bft_crdt_keys::write(&bft_crdt_key_path)?; println!("Writing bitcoin key to: {:?}", bitcoin_key_path); bitcoin_keys::write(&bitcoin_key_path)?; diff --git a/side-node/src/lib.rs b/side-node/src/lib.rs index 349d71a..60e4335 100644 --- a/side-node/src/lib.rs +++ b/side-node/src/lib.rs @@ -5,11 +5,11 @@ use node::SideNode; use tokio::{sync::mpsc, task}; use websocket::WebSocketClient; +pub mod bft_crdt_keys; pub(crate) mod bitcoin_keys; pub(crate) mod cli; pub mod crdt; pub(crate) mod init; -pub mod keys; pub mod node; pub(crate) mod stdin; pub mod utils; @@ -39,7 +39,7 @@ pub async fn run() { async fn setup(name: &String) -> SideNode { // First, load up the keys and create a bft-crdt let side_dir = utils::home(name); - let bft_crdt_keys = keys::load_from_file(side_dir); + let bft_crdt_keys = bft_crdt_keys::load_from_file(side_dir); let crdt = BaseCrdt::::new(&bft_crdt_keys); // Channels for internal communication, and a tokio task for stdin input