Serialization of SignedOp now works; adding to the CRDT doesn't

side-node/Cargo.toml

@@ -14,6 +14,7 @@ bft-crdt-derive = { path = "../crates/bft-json-crdt/bft-crdt-derive" }
 # serde_cbor = "0.11.2" # move to this once we need to pack things in CBOR
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.117"
+serde_with = "3.8.1"
 
 [features]
 default = ["bft", "logging-list", "logging-json"]

side-node/src/websocket/mod.rs

@@ -1,4 +1,5 @@
 use bft_crdt_derive::add_crdt_fields;
+use bft_json_crdt::json_crdt::SignedOp;
 use bft_json_crdt::keypair::KeyPair;
 use bft_json_crdt::{
     json_crdt::{BaseCrdt, CrdtNode, IntoCrdtNode},
@@ -15,27 +16,38 @@ pub(crate) async fn start() -> Result<(), websockets::WebSocketError> {
     println!("connecting to websocket at ws://127.0.0.1:8080/");
     let mut ws = WebSocket::connect("ws://127.0.0.1:8080/").await?;
 
-    // generate a placeholder transaction
-    let json = generate_transaction().unwrap();
-
     // set up a new BFT-CRDT
     let keys = make_keypair();
     let mut bft_crdt = BaseCrdt::<ListExample>::new(&keys);
     println!("Generated a new CRDT with public key: {}", keys.public());
 
+    // generate a placeholder transaction
+    let transaction = generate_transaction();
+
+    let json = convert_to_json(&transaction).unwrap();
+
     // next job is to keep adding to this guy
-    let _a = bft_crdt.doc.list.insert(ROOT_ID, 'a').sign(&keys);
+    let signed_op = bft_crdt.doc.list.insert(ROOT_ID, json.clone()).sign(&keys);
+    println!("SignedOp before send is: {:?}", signed_op);
 
     let mut interval = every_two_seconds();
     loop {
         interval.tick().await;
-        println!("Sending: {}", json);
-        ws.send_text(json.clone()).await?;
+        println!("Sending: {:?}", signed_op);
+        ws.send_text(serde_json::to_string(&signed_op).unwrap())
+            .await?;
 
         let msg = ws.receive().await?;
         println!("Received: {:?}", msg);
+
+        // deserialize the received Frame into a string
+        let msg = msg.into_text().unwrap().0;
+
+        // deserialize the message into a Transaction struct
+        let operation: SignedOp = serde_json::from_str(&msg).unwrap();
+
         // TODO:  bft_crdt.apply() changes in here when we receive socket input from other nodes
-        bft_crdt.apply(msg);
+        bft_crdt.apply(operation);
         println!("New crdt state is: {}", bft_crdt.doc.view())
     }
 }
@@ -59,15 +71,17 @@ struct Transaction {
     amount: f64,
 }
 
-fn generate_transaction() -> serde_json::Result<String> {
-    let transaction = Transaction {
+fn generate_transaction() -> Transaction {
+    Transaction {
         from: "Alice".to_string(),
         to: "Bob".to_string(),
         amount: 100.0,
         path: vec![],
         id: [0; ED25519_PUBLIC_KEY_LENGTH],
-    };
+    }
+}
 
+fn convert_to_json(transaction: &Transaction) -> serde_json::Result<String> {
     let json = serde_json::to_string(&transaction).unwrap();
     Ok(json)
 }