diff --git a/side-node/src/bft_crdt/mod.rs b/side-node/src/bft_crdt/mod.rs index 8c24834..5025322 100644 --- a/side-node/src/bft_crdt/mod.rs +++ b/side-node/src/bft_crdt/mod.rs @@ -6,6 +6,7 @@ use bft_json_crdt::{ use serde::{Deserialize, Serialize}; pub mod keys; +pub mod websocket; #[add_crdt_fields] #[derive(Clone, CrdtNode, Serialize, Deserialize)] diff --git a/side-node/src/clients/websocket.rs b/side-node/src/bft_crdt/websocket.rs similarity index 100% rename from side-node/src/clients/websocket.rs rename to side-node/src/bft_crdt/websocket.rs diff --git a/side-node/src/clients/mod.rs b/side-node/src/clients/mod.rs index 6eba44d..8b13789 100644 --- a/side-node/src/clients/mod.rs +++ b/side-node/src/clients/mod.rs @@ -1 +1 @@ -pub mod websocket; + diff --git a/side-node/src/lib.rs b/side-node/src/lib.rs index 1635475..eb6f4f8 100644 --- a/side-node/src/lib.rs +++ b/side-node/src/lib.rs @@ -1,13 +1,14 @@ +use bft_crdt::websocket; use bft_crdt::TransactionList; use bft_json_crdt::json_crdt::{BaseCrdt, SignedOp}; use cli::{parse_args, Commands}; -use clients::websocket; use node::SideNode; use tokio::{sync::mpsc, task}; pub mod bft_crdt; pub mod bitcoin; pub(crate) mod cli; + pub mod clients; pub(crate) mod init; pub mod node; diff --git a/side-node/src/node.rs b/side-node/src/node.rs index c8af43d..9cde341 100644 --- a/side-node/src/node.rs +++ b/side-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::TransactionList, clients::websocket::Client, utils}; +use crate::{bft_crdt::websocket::Client, bft_crdt::TransactionList, utils}; pub struct SideNode { crdt: BaseCrdt, diff --git a/side-node/tests/side_node.rs b/side-node/tests/side_node.rs index 4883605..18f597e 100644 --- a/side-node/tests/side_node.rs +++ b/side-node/tests/side_node.rs @@ -3,7 +3,7 @@ use bft_json_crdt::{ keypair::make_keypair, }; use side_node::{ - bft_crdt::TransactionList, bitcoin, clients::websocket::Client, node::SideNode, utils, + bft_crdt::websocket::Client, bft_crdt::TransactionList, bitcoin, node::SideNode, utils, }; use tokio::sync::mpsc;