Experimenting with distributed nodes. Wish I had more logging!
This commit is contained in:
@@ -41,14 +41,14 @@ pub(crate) async fn send(
|
|||||||
let transaction = generate_transaction(count, keys.public().to_string());
|
let transaction = generate_transaction(count, keys.public().to_string());
|
||||||
|
|
||||||
// next job is to keep adding to this guy
|
// next job is to keep adding to this guy
|
||||||
|
let next = bft_crdt.doc.list.ops.len();
|
||||||
let signed_op = bft_crdt
|
let signed_op = bft_crdt
|
||||||
.doc
|
.doc
|
||||||
.list
|
.list
|
||||||
.insert_idx(0, transaction.clone())
|
.insert_idx(next - 1, transaction.clone())
|
||||||
.sign(&keys);
|
.sign(&keys);
|
||||||
println!("SignedOp being sent is: {:?}", signed_op);
|
// println!("SignedOp being sent is: {:?}", signed_op);
|
||||||
|
|
||||||
println!("Sending: {:?}", signed_op);
|
|
||||||
Ok(ws
|
Ok(ws
|
||||||
.send_text(serde_json::to_string(&signed_op).unwrap())
|
.send_text(serde_json::to_string(&signed_op).unwrap())
|
||||||
.await?)
|
.await?)
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
use crate::list_transaction_crdt::{self, CrdtList};
|
use crate::list_transaction_crdt::{self, CrdtList};
|
||||||
|
use base64::{engine::general_purpose, Engine as _};
|
||||||
|
use bft_json_crdt::json_crdt::BaseCrdt;
|
||||||
use bft_json_crdt::json_crdt::SignedOp;
|
use bft_json_crdt::json_crdt::SignedOp;
|
||||||
use bft_json_crdt::json_crdt::{BaseCrdt, CrdtNode};
|
|
||||||
use bft_json_crdt::keypair::Ed25519KeyPair;
|
use bft_json_crdt::keypair::Ed25519KeyPair;
|
||||||
use tokio::time;
|
use tokio::time;
|
||||||
use websockets::WebSocket;
|
use websockets::WebSocket;
|
||||||
|
|
||||||
/// Starts a websocket and periodically sends a BFT-CRDT message to the websocket server
|
/// Starts a websocket and periodically sends a BFT-CRDT message to the websocket server
|
||||||
pub(crate) async fn start(
|
pub(crate) async fn start(
|
||||||
keys: Ed25519KeyPair,
|
keys: Ed25519KeyPair,
|
||||||
@@ -13,29 +13,36 @@ pub(crate) async fn start(
|
|||||||
println!("connecting to websocket at ws://127.0.0.1:8080/");
|
println!("connecting to websocket at ws://127.0.0.1:8080/");
|
||||||
let mut ws = WebSocket::connect("ws://127.0.0.1:8080/").await?;
|
let mut ws = WebSocket::connect("ws://127.0.0.1:8080/").await?;
|
||||||
|
|
||||||
let mut interval = every_two_seconds();
|
let mut interval = every_ten_seconds();
|
||||||
let mut count = 0;
|
let mut count = 0;
|
||||||
loop {
|
loop {
|
||||||
let _ = list_transaction_crdt::send(count, bft_crdt, &mut ws, &keys).await;
|
let _ = list_transaction_crdt::send(count, bft_crdt, &mut ws, &keys).await;
|
||||||
|
|
||||||
let msg = ws.receive().await?;
|
let msg = ws.receive().await?;
|
||||||
println!("Received: {:?}", msg);
|
// println!("Received: {:?}", msg);
|
||||||
|
|
||||||
// deserialize the received websocket Frame into a string
|
// deserialize the received websocket Frame into a string
|
||||||
let msg = msg.into_text().unwrap().0;
|
let msg = msg.into_text().unwrap().0;
|
||||||
|
|
||||||
// deserialize the message into a Transaction struct
|
// deserialize the message into a Transaction struct
|
||||||
let incoming_operation: SignedOp = serde_json::from_str(&msg).unwrap();
|
let incoming_operation: SignedOp = serde_json::from_str(&msg).unwrap();
|
||||||
println!("Received a new network operation: {:?}", incoming_operation);
|
println!(
|
||||||
|
"Received a new network operation from: {:?}",
|
||||||
|
general_purpose::STANDARD.encode(&incoming_operation.author())
|
||||||
|
);
|
||||||
|
|
||||||
bft_crdt.apply(incoming_operation);
|
bft_crdt.apply(incoming_operation);
|
||||||
|
// println!("New crdt state is: {}", bft_crdt.doc.view());
|
||||||
|
|
||||||
println!("New crdt state is: {}", bft_crdt.doc.view());
|
|
||||||
count = count + 1;
|
count = count + 1;
|
||||||
interval.tick().await;
|
interval.tick().await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn every_two_seconds() -> time::Interval {
|
// fn every_two_seconds() -> time::Interval {
|
||||||
time::interval(time::Duration::from_secs(2))
|
// time::interval(time::Duration::from_secs(2))
|
||||||
|
// }
|
||||||
|
|
||||||
|
fn every_ten_seconds() -> time::Interval {
|
||||||
|
time::interval(time::Duration::from_secs(10))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,9 +24,12 @@ fn main() {
|
|||||||
client_id, message
|
client_id, message
|
||||||
);
|
);
|
||||||
// retrieve this client's `Responder`:
|
// retrieve this client's `Responder`:
|
||||||
let responder = clients.get(&client_id).unwrap();
|
// let responder = clients.get(&client_id).unwrap();
|
||||||
// echo the message back:
|
let all_clients = clients.keys().collect::<Vec<_>>();
|
||||||
responder.send(message);
|
for client in all_clients {
|
||||||
|
let other_responder = clients.get(client).unwrap();
|
||||||
|
other_responder.send(message.clone());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user