From b1f5d2b75a1c9ff21900e956c68dae2a6a94d30c Mon Sep 17 00:00:00 2001
From: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
Date: Fri, 7 Jun 2024 14:58:41 +0100
Subject: [PATCH] User serde_json for SignedOp serialization

---
 crates/bft-json-crdt/src/json_crdt.rs  | 6 ------
 side-node/src/list_transaction_crdt.rs | 2 +-
 side-node/src/websocket/mod.rs         | 6 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/crates/bft-json-crdt/src/json_crdt.rs b/crates/bft-json-crdt/src/json_crdt.rs
index e7f74e0..d8cd558 100644
--- a/crates/bft-json-crdt/src/json_crdt.rs
+++ b/crates/bft-json-crdt/src/json_crdt.rs
@@ -123,12 +123,6 @@ pub struct SignedOp {
     pub depends_on: Vec<SignedDigest>,
 }
 
-impl Display for SignedOp {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "SignedOp({})", self)
-    }
-}
-
 impl SignedOp {
     pub fn id(&self) -> OpId {
         self.inner.id
diff --git a/side-node/src/list_transaction_crdt.rs b/side-node/src/list_transaction_crdt.rs
index 6e4be79..cee3033 100644
--- a/side-node/src/list_transaction_crdt.rs
+++ b/side-node/src/list_transaction_crdt.rs
@@ -35,7 +35,7 @@ pub(crate) fn new(side_dir: PathBuf) -> (BaseCrdt<CrdtList>, Ed25519KeyPair) {
     (bft_crdt, keys)
 }
 
-pub(crate) fn send(
+pub(crate) fn create(
     bft_crdt: &mut BaseCrdt<CrdtList>,
     keys: &Ed25519KeyPair,
 ) -> bft_json_crdt::json_crdt::SignedOp {
diff --git a/side-node/src/websocket/mod.rs b/side-node/src/websocket/mod.rs
index d8ca37b..e0fe647 100644
--- a/side-node/src/websocket/mod.rs
+++ b/side-node/src/websocket/mod.rs
@@ -51,10 +51,10 @@ pub(crate) async fn start(keys: Ed25519KeyPair, bft_crdt: &mut BaseCrdt<CrdtList
         let signed_op = if let "exit" = line.as_str() {
             break;
         } else {
-            let op = list_transaction_crdt::send(bft_crdt, &keys);
-            op.to_string()
+            list_transaction_crdt::create(bft_crdt, &keys)
         };
         tracing::info!("sending {:?}", signed_op);
-        handle.text(signed_op).unwrap();
+        let json = serde_json::to_string(&signed_op).unwrap();
+        handle.text(json).unwrap();
     }
 }