From c528160d347f8b4647463efbb3dec64e5a134ad7 Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Thu, 12 Jun 2025 16:32:22 -0400
Subject: [PATCH] Moved websocket out onto the root

---
 crdt-node/src/bft_crdt/mod.rs             | 1 -
 crdt-node/src/lib.rs                      | 2 +-
 crdt-node/src/node.rs                     | 2 +-
 crdt-node/src/{bft_crdt => }/websocket.rs | 0
 crdt-node/tests/side_node.rs              | 4 ++--
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename crdt-node/src/{bft_crdt => }/websocket.rs (100%)

diff --git a/crdt-node/src/bft_crdt/mod.rs b/crdt-node/src/bft_crdt/mod.rs
index 8dbc346..106bd9a 100644
--- a/crdt-node/src/bft_crdt/mod.rs
+++ b/crdt-node/src/bft_crdt/mod.rs
@@ -6,7 +6,6 @@ use bft_json_crdt::{
 use serde::{Deserialize, Serialize};
 
 pub mod keys;
-pub mod websocket;
 
 #[add_crdt_fields]
 #[derive(Clone, CrdtNode, Serialize, Deserialize, Debug)]
diff --git a/crdt-node/src/lib.rs b/crdt-node/src/lib.rs
index 2db08a4..a1c7956 100644
--- a/crdt-node/src/lib.rs
+++ b/crdt-node/src/lib.rs
@@ -1,4 +1,3 @@
-use bft_crdt::websocket;
 use bft_crdt::TransactionList;
 use bft_json_crdt::json_crdt::{BaseCrdt, SignedOp};
 use cli::Commands;
@@ -11,6 +10,7 @@ pub(crate) mod init;
 pub mod node;
 mod stdin;
 pub mod utils;
+pub mod websocket;
 
 #[tokio::main]
 pub async fn run() {
diff --git a/crdt-node/src/node.rs b/crdt-node/src/node.rs
index bea0b35..d82eda4 100644
--- a/crdt-node/src/node.rs
+++ b/crdt-node/src/node.rs
@@ -3,7 +3,7 @@ use bft_json_crdt::json_crdt::{BaseCrdt, SignedOp};
 use fastcrypto::ed25519::Ed25519KeyPair;
 use tokio::sync::mpsc;
 
-use crate::{bft_crdt::websocket::Client, bft_crdt::TransactionList, utils};
+use crate::{bft_crdt::TransactionList, utils, websocket::Client};
 
 pub struct SideNode {
     crdt: BaseCrdt<TransactionList>,
diff --git a/crdt-node/src/bft_crdt/websocket.rs b/crdt-node/src/websocket.rs
similarity index 100%
rename from crdt-node/src/bft_crdt/websocket.rs
rename to crdt-node/src/websocket.rs
diff --git a/crdt-node/tests/side_node.rs b/crdt-node/tests/side_node.rs
index 0cf4a28..514d0dd 100644
--- a/crdt-node/tests/side_node.rs
+++ b/crdt-node/tests/side_node.rs
@@ -2,7 +2,7 @@ use bft_json_crdt::{
     json_crdt::{BaseCrdt, SignedOp},
     keypair::make_keypair,
 };
-use crdt_node::{bft_crdt::websocket::Client, bft_crdt::TransactionList, node::SideNode, utils};
+use crdt_node::{bft_crdt::TransactionList, node::SideNode, utils, websocket};
 use tokio::sync::mpsc;
 
 #[tokio::test]
@@ -42,7 +42,7 @@ async fn setup(_: &str) -> SideNode {
     let (_, stdin_receiver) = std::sync::mpsc::channel();
 
     // Finally, create the node and return it
-    let handle = Client::new(incoming_sender).await;
+    let handle = websocket::Client::new(incoming_sender).await;
     let node = SideNode::new(
         crdt,
         bft_crdt_keys,