dave/bft-crdt-experiment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the websocket client into bft_crdt module

Browse Source
This commit is contained in:
Dave Hrycyszyn
2024-06-25 13:54:10 +01:00
parent e6a4fe0fd6
commit a1e62ebb51
6 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
side-node/src/bft_crdt/mod.rs
View File

@@ -6,6 +6,7 @@ use bft_json_crdt::{
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
pub mod keys; pub mod keys;
pub mod websocket;
#[add_crdt_fields] #[add_crdt_fields]
#[derive(Clone, CrdtNode, Serialize, Deserialize)] #[derive(Clone, CrdtNode, Serialize, Deserialize)]

0
side-node/src/clients/websocket.rs → side-node/src/bft_crdt/websocket.rs
View File

2
side-node/src/clients/mod.rs
View File

@@ -1 +1 @@
pub mod websocket;

3
side-node/src/lib.rs
View File

@@ -1,13 +1,14 @@
use bft_crdt::websocket;
use bft_crdt::TransactionList; use bft_crdt::TransactionList;
use bft_json_crdt::json_crdt::{BaseCrdt, SignedOp}; use bft_json_crdt::json_crdt::{BaseCrdt, SignedOp};
use cli::{parse_args, Commands}; use cli::{parse_args, Commands};
use clients::websocket;
use node::SideNode; use node::SideNode;
use tokio::{sync::mpsc, task}; use tokio::{sync::mpsc, task};
pub mod bft_crdt; pub mod bft_crdt;
pub mod bitcoin; pub mod bitcoin;
pub(crate) mod cli; pub(crate) mod cli;
pub mod clients; pub mod clients;
pub(crate) mod init; pub(crate) mod init;
pub mod node; pub mod node;

2
side-node/src/node.rs
View File

@@ -3,7 +3,7 @@ use bft_json_crdt::json_crdt::{BaseCrdt, SignedOp};
use fastcrypto::ed25519::Ed25519KeyPair; use fastcrypto::ed25519::Ed25519KeyPair;
use tokio::sync::mpsc; 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 { pub struct SideNode {
crdt: BaseCrdt<TransactionList>, crdt: BaseCrdt<TransactionList>,

2
side-node/tests/side_node.rs
View File

@@ -3,7 +3,7 @@ use bft_json_crdt::{
keypair::make_keypair, keypair::make_keypair,
}; };
use side_node::{ 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; use tokio::sync::mpsc;