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

User serde_json for SignedOp serialization

Browse Source
This commit is contained in:
Dave Hrycyszyn
2024-06-07 14:58:41 +01:00
parent 95e3127903
commit b1f5d2b75a
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bft-json-crdt/src/json_crdt.rs
View File

@@ -123,12 +123,6 @@ pub struct SignedOp {
pub depends_on: Vec<SignedDigest>, 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 { impl SignedOp {
pub fn id(&self) -> OpId { pub fn id(&self) -> OpId {
self.inner.id self.inner.id

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

@@ -35,7 +35,7 @@ pub(crate) fn new(side_dir: PathBuf) -> (BaseCrdt<CrdtList>, Ed25519KeyPair) {
(bft_crdt, keys) (bft_crdt, keys)
} }
pub(crate) fn send( pub(crate) fn create(
bft_crdt: &mut BaseCrdt<CrdtList>, bft_crdt: &mut BaseCrdt<CrdtList>,
keys: &Ed25519KeyPair, keys: &Ed25519KeyPair,
) -> bft_json_crdt::json_crdt::SignedOp { ) -> bft_json_crdt::json_crdt::SignedOp {

6
side-node/src/websocket/mod.rs
View File

@@ -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() { let signed_op = if let "exit" = line.as_str() {
break; break;
} else { } else {
let op = list_transaction_crdt::send(bft_crdt, &keys); list_transaction_crdt::create(bft_crdt, &keys)
op.to_string()
}; };
tracing::info!("sending {:?}", signed_op); tracing::info!("sending {:?}", signed_op);
handle.text(signed_op).unwrap(); let json = serde_json::to_string(&signed_op).unwrap();
handle.text(json).unwrap();
} }
} }