From a29a0fca0426c62aa920f253caf03e965aa07016 Mon Sep 17 00:00:00 2001
From: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
Date: Thu, 20 Jun 2024 17:13:34 +0100
Subject: [PATCH] Moved keys submodules

---
 side-node/src/init/mod.rs                            | 6 +++---
 side-node/src/{bft_crdt_keys.rs => keys/bft_crdt.rs} | 0
 side-node/src/{bitcoin_keys.rs => keys/bitcoin.rs}   | 0
 side-node/src/keys/mod.rs                            | 2 ++
 side-node/src/lib.rs                                 | 7 +++----
 side-node/tests/side_node.rs                         | 6 ++----
 6 files changed, 10 insertions(+), 11 deletions(-)
 rename side-node/src/{bft_crdt_keys.rs => keys/bft_crdt.rs} (100%)
 rename side-node/src/{bitcoin_keys.rs => keys/bitcoin.rs} (100%)
 create mode 100644 side-node/src/keys/mod.rs

diff --git a/side-node/src/init/mod.rs b/side-node/src/init/mod.rs
index ab0457a..2f07328 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::{bft_crdt_keys, bitcoin_keys, utils};
+use crate::{keys, utils};
 
 pub(crate) mod config;
 
@@ -11,10 +11,10 @@ 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);
-    bft_crdt_keys::write(&bft_crdt_key_path)?;
+    keys::bft_crdt::write(&bft_crdt_key_path)?;
 
     println!("Writing bitcoin key to: {:?}", bitcoin_key_path);
-    bitcoin_keys::write(&bitcoin_key_path)?;
+    keys::bitcoin::write(&bitcoin_key_path)?;
 
     println!("Writing config to: {:?}", config_path);
     config::write_toml(&config, &config_path).expect("unable to write config file");
diff --git a/side-node/src/bft_crdt_keys.rs b/side-node/src/keys/bft_crdt.rs
similarity index 100%
rename from side-node/src/bft_crdt_keys.rs
rename to side-node/src/keys/bft_crdt.rs
diff --git a/side-node/src/bitcoin_keys.rs b/side-node/src/keys/bitcoin.rs
similarity index 100%
rename from side-node/src/bitcoin_keys.rs
rename to side-node/src/keys/bitcoin.rs
diff --git a/side-node/src/keys/mod.rs b/side-node/src/keys/mod.rs
new file mode 100644
index 0000000..c5a0529
--- /dev/null
+++ b/side-node/src/keys/mod.rs
@@ -0,0 +1,2 @@
+pub mod bft_crdt;
+pub mod bitcoin;
diff --git a/side-node/src/lib.rs b/side-node/src/lib.rs
index 068d00e..9400626 100644
--- a/side-node/src/lib.rs
+++ b/side-node/src/lib.rs
@@ -5,11 +5,10 @@ use node::SideNode;
 use tokio::{sync::mpsc, task};
 use websocket::WebSocketClient;
 
-pub mod bft_crdt_keys;
-pub 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,8 +38,8 @@ 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 = bft_crdt_keys::load_from_file(&side_dir);
-    let bitcoin_keys = bitcoin_keys::load_from_file(&side_dir);
+    let bft_crdt_keys = keys::bft_crdt::load_from_file(&side_dir);
+    let bitcoin_keys = keys::bitcoin::load_from_file(&side_dir);
     let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys);
 
     // Channels for internal communication, and a tokio task for stdin input
diff --git a/side-node/tests/side_node.rs b/side-node/tests/side_node.rs
index 4263972..355d7d6 100644
--- a/side-node/tests/side_node.rs
+++ b/side-node/tests/side_node.rs
@@ -2,9 +2,7 @@ use bft_json_crdt::{
     json_crdt::{BaseCrdt, SignedOp},
     keypair::make_keypair,
 };
-use side_node::{
-    bitcoin_keys, crdt::TransactionList, node::SideNode, utils, websocket::WebSocketClient,
-};
+use side_node::{crdt::TransactionList, keys, node::SideNode, utils, websocket::WebSocketClient};
 use tokio::sync::mpsc;
 
 #[tokio::test]
@@ -37,7 +35,7 @@ async fn test_distribute_via_websockets() {
 async fn setup(_: &str) -> SideNode {
     // First, load up the keys and create a bft-crdt
     let bft_crdt_keys = make_keypair();
-    let bitcoin_keys = bitcoin_keys::make_keypair();
+    let bitcoin_keys = keys::bitcoin::make_keypair();
     let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys);
 
     // Channels for internal communication, and a tokio task for stdin input