From 7c278e9eb25e2862f55d5feda2b6b784f9675764 Mon Sep 17 00:00:00 2001
From: NicolasCantu <nicolas.cantu@pm.me>
Date: Fri, 14 Feb 2025 16:19:34 +0100
Subject: [PATCH] Update tests

---
 src/commit.rs | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/commit.rs b/src/commit.rs
index ba9701c..2a326a7 100644
--- a/src/commit.rs
+++ b/src/commit.rs
@@ -333,6 +333,7 @@ fn commit_new_transaction(
 mod tests {
     use super::*;
 
+    use bitcoincore_rpc::bitcoin::consensus::deserialize;
     use bitcoincore_rpc::bitcoin::hex::DisplayHex;
     use sdk_common::pcd::Member;
     use sdk_common::pcd::RoleDefinition;
@@ -476,7 +477,7 @@ mod tests {
         }
     }
 
-    fn mock_commit_msg(init_tx: Transaction, first: bool) -> CommitMessage {
+    fn mock_commit_msg(process_id: OutPoint) -> CommitMessage {
         let field_name = "roles".to_owned();
         let member = Member::new(vec![SilentPaymentAddress::try_from(LOCAL_ADDRESS).unwrap()]).unwrap();        
         let validation_rule = ValidationRule::new(1.0, vec![field_name.clone()], 1.0).unwrap();
@@ -489,10 +490,8 @@ mod tests {
         let roles = HashMap::from([(String::from("role_name"), role_def)]);
         let pcd_commitment = json!({field_name: "b30212b9649054b71f938fbe0d1c08e72de95bdb12b8008082795c6e9c4ad26a"});
 
-        let init_tx = if first { serialize(&init_tx).to_lower_hex_string() } else { OutPoint::new(init_tx.txid(), 0).to_string() };
-
         let commit_msg = CommitMessage {
-            init_tx,
+            process_id,
             roles: roles.clone(),
             validation_tokens: vec![],
             pcd_commitment: pcd_commitment.clone(),
@@ -507,24 +506,24 @@ mod tests {
         initialize_static_variables();
         let init_tx = deserialize::<Transaction>(&Vec::from_hex(INIT_TRANSACTION).unwrap()).unwrap();
         let init_txid = init_tx.txid();
-        let init_commitment = OutPoint::new(init_txid, 0);
+        let process_id = OutPoint::new(init_txid, 0);
 
-        let commit_msg = mock_commit_msg(init_tx, true);
+        let commit_msg = mock_commit_msg(process_id);
 
         let roles = commit_msg.roles.clone();
         let pcd_commitment = commit_msg.pcd_commitment.clone();
 
         let empty_state = ProcessState {
-            commited_in: init_commitment,
+            commited_in: process_id,
             ..Default::default()
         };
 
         let result = handle_commit_request(commit_msg);
 
-        assert_eq!(result.unwrap(), init_commitment);
+        assert_eq!(result.unwrap(), process_id);
 
         let cache = CACHEDPROCESSES.get().unwrap().lock().unwrap();
-        let updated_process = cache.get(&init_commitment);
+        let updated_process = cache.get(&process_id);
 
         assert!(updated_process.is_some());
         let concurrent_states = updated_process.unwrap().get_latest_concurrent_states().unwrap();
@@ -534,7 +533,7 @@ mod tests {
         let mut roles_map = Map::new();
         roles_map.insert("roles".to_owned(), roles_object);
         let new_state = ProcessState {
-            commited_in: init_commitment,
+            commited_in: process_id,
             pcd_commitment,
             encrypted_pcd: Value::Object(roles_map),
             ..Default::default()
@@ -549,22 +548,22 @@ mod tests {
         initialize_static_variables();
         let init_tx = deserialize::<Transaction>(&Vec::from_hex(INIT_TRANSACTION).unwrap()).unwrap();
         let init_txid = init_tx.txid();
-        let init_commitment = OutPoint::new(init_txid, 0);
+        let process_id = OutPoint::new(init_txid, 0);
 
-        let commit_msg = mock_commit_msg(init_tx, false);
+        let commit_msg = mock_commit_msg(process_id);
 
         let roles = commit_msg.roles.clone();
         let pcd_commitment = commit_msg.pcd_commitment.clone();
 
-        let process = Process::new(init_commitment);
-        CACHEDPROCESSES.get().unwrap().lock().unwrap().insert(init_commitment, process);
+        let process = Process::new(process_id);
+        CACHEDPROCESSES.get().unwrap().lock().unwrap().insert(process_id, process);
 
         let result = handle_commit_request(commit_msg);
 
-        assert_eq!(result.unwrap(), init_commitment);
+        assert_eq!(result.unwrap(), process_id);
 
         let cache = CACHEDPROCESSES.get().unwrap().lock().unwrap();
-        let updated_process = cache.get(&init_commitment);
+        let updated_process = cache.get(&process_id);
 
         assert!(updated_process.is_some());
         let concurrent_states = updated_process.unwrap().get_latest_concurrent_states().unwrap();
@@ -573,13 +572,13 @@ mod tests {
         let mut roles_map = Map::new();
         roles_map.insert("roles".to_owned(), roles_object);
         let new_state = ProcessState {
-            commited_in: init_commitment,
+            commited_in: process_id,
             pcd_commitment,
             encrypted_pcd: Value::Object(roles_map),
             ..Default::default()
         };
         let empty_state = ProcessState {
-            commited_in: init_commitment,
+            commited_in: process_id,
             ..Default::default()
         };
         let target = vec![&empty_state, &new_state];