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

Minor refactors

Browse Source
This commit is contained in:
Dave
2025-06-12 16:23:56 -04:00
parent 79ce80a4a4
commit 365cfd7b01
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crdt-node/src/lib.rs
View File

@@ -1,7 +1,7 @@
use bft_crdt::websocket; 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::Commands;
use node::SideNode; use node::SideNode;
use tokio::{sync::mpsc, task}; use tokio::{sync::mpsc, task};
@@ -13,7 +13,7 @@ pub mod utils;
#[tokio::main] #[tokio::main]
pub async fn run() { pub async fn run() {
let args = parse_args(); let args = cli::parse_args();
match &args.command { match &args.command {
Some(Commands::Init { name }) => { Some(Commands::Init { name }) => {
@@ -33,9 +33,9 @@ pub async fn run() {
/// Wire everything up outside the application so that we can test more easily later /// Wire everything up outside the application so that we can test more easily later
async fn setup(name: &String) -> SideNode { async fn setup(name: &String) -> SideNode {
// First, load up the keys and create a bft-bft-crdt // First, load up the keys and create a bft-crdt node
let side_dir = utils::home(name); let home_dir = utils::home(name);
let bft_crdt_keys = bft_crdt::keys::load_from_file(&side_dir); let bft_crdt_keys = bft_crdt::keys::load_from_file(&home_dir);
let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys); let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys);
// Channels for internal communication, and a tokio task for stdin input // Channels for internal communication, and a tokio task for stdin input
@@ -45,8 +45,9 @@ async fn setup(name: &String) -> SideNode {
bft_crdt::stdin::input(stdin_sender); bft_crdt::stdin::input(stdin_sender);
}); });
// Finally, create the node and return it // Wire the websocket client to the incoming channel
let handle = websocket::Client::new(incoming_sender).await; let handle = websocket::Client::new(incoming_sender).await;
// Finally, create the node and return it
let node = SideNode::new( let node = SideNode::new(
crdt, crdt,
bft_crdt_keys, bft_crdt_keys,