From 60e87383b02155dca2b127e679462f1317fe50e4 Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Tue, 18 Jun 2024 17:12:05 +0100 Subject: [PATCH] Getting ready to format a Bitcoin transaction --- side-node/src/node.rs | 2 +- side-node/src/utils.rs | 2 +- side-node/tests/crdt.rs | 6 +++--- side-node/tests/side_node.rs | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/side-node/src/node.rs b/side-node/src/node.rs index 8d1aac6..19156a8 100644 --- a/side-node/src/node.rs +++ b/side-node/src/node.rs @@ -39,7 +39,7 @@ impl SideNode { loop { match self.stdin_receiver.try_recv() { Ok(stdin) => { - let transaction = utils::fake_transaction_json(stdin); + let transaction = utils::fake_generic_transaction_json(stdin); let json = serde_json::to_value(transaction).unwrap(); let signed_op = self.add_transaction_local(json); println!("STDIN: {}", utils::shappy(signed_op.clone())); diff --git a/side-node/src/utils.rs b/side-node/src/utils.rs index aa55a83..dda9264 100644 --- a/side-node/src/utils.rs +++ b/side-node/src/utils.rs @@ -29,7 +29,7 @@ pub(crate) fn home(name: &String) -> std::path::PathBuf { } /// Generate a fake transaction with customizable from_pubkey String -pub fn fake_transaction_json(from: String) -> Value { +pub fn fake_generic_transaction_json(from: String) -> Value { json!({ "from": from, "to": "Bob", diff --git a/side-node/tests/crdt.rs b/side-node/tests/crdt.rs index d9f0a1c..57c2180 100644 --- a/side-node/tests/crdt.rs +++ b/side-node/tests/crdt.rs @@ -11,9 +11,9 @@ fn test_valid_updates() { let keypair1 = make_keypair(); let mut crdt1 = BaseCrdt::::new(&keypair1); - let val_a = side_node::utils::fake_transaction_json(String::from("a")); - let val_b = side_node::utils::fake_transaction_json(String::from("b")); - let val_c = side_node::utils::fake_transaction_json(String::from("c")); + let val_a = side_node::utils::fake_generic_transaction_json(String::from("a")); + let val_b = side_node::utils::fake_generic_transaction_json(String::from("b")); + let val_c = side_node::utils::fake_generic_transaction_json(String::from("c")); let _a = crdt1 .doc diff --git a/side-node/tests/side_node.rs b/side-node/tests/side_node.rs index 524b11a..4263972 100644 --- a/side-node/tests/side_node.rs +++ b/side-node/tests/side_node.rs @@ -14,19 +14,19 @@ async fn test_distribute_via_websockets() { assert_eq!(node1.current_sha(), node2.current_sha()); - let transaction = utils::fake_transaction_json("from_alice".to_string()); + let transaction = utils::fake_generic_transaction_json("from_alice".to_string()); let signed_op = node1.add_transaction_local(transaction); node2.handle_incoming(signed_op); assert_eq!(node1.current_sha(), node2.current_sha()); - let transaction = utils::fake_transaction_json("from_alice2".to_string()); + let transaction = utils::fake_generic_transaction_json("from_alice2".to_string()); let signed_op = node1.add_transaction_local(transaction); node2.handle_incoming(signed_op); assert_eq!(node1.current_sha(), node2.current_sha()); - let transaction = utils::fake_transaction_json("from_alice3".to_string()); + let transaction = utils::fake_generic_transaction_json("from_alice3".to_string()); let signed_op = node1.add_transaction_local(transaction); node2.handle_incoming(signed_op);