From d3fb9656f21b8d4a8cbe72fed758a94e23c61e9a Mon Sep 17 00:00:00 2001
From: binarybaron <binarybaron@unstoppableswap.net>
Date: Thu, 25 Jul 2024 20:23:59 +0200
Subject: [PATCH] fix: rpc tests

---
 swap/src/api/request.rs | 12 ++++++------
 swap/tests/rpc.rs       | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/swap/src/api/request.rs b/swap/src/api/request.rs
index 360e6e48..64ad0f69 100644
--- a/swap/src/api/request.rs
+++ b/swap/src/api/request.rs
@@ -664,13 +664,13 @@ impl Request {
                         let exchange_rate = format!("{} XMR/BTC", exchange_rate.round_dp(8));
 
                         let swap_data = json!({
-                            "swap_id": swap_id.to_string(),
-                            "start_date": swap_start_date.to_string(),
+                            "swapId": swap_id.to_string(),
+                            "startDate": swap_start_date.to_string(),
                             "state": latest_state.to_string(),
-                            "btc_amount": btc_amount.to_string(),
-                            "xmr_amount": xmr_amount.to_string(),
-                            "exchange_rate": exchange_rate,
-                            "trading_partner_peer_id": peer_id.to_string()
+                            "btcAmount": btc_amount.to_string(),
+                            "xmrAmount": xmr_amount.to_string(),
+                            "exchangeRate": exchange_rate,
+                            "tradingPartnerPeerId": peer_id.to_string()
                         });
 
                         if context.config.json {
diff --git a/swap/tests/rpc.rs b/swap/tests/rpc.rs
index 5dc640d4..3321f0eb 100644
--- a/swap/tests/rpc.rs
+++ b/swap/tests/rpc.rs
@@ -79,7 +79,7 @@ mod test {
     }
 
     // Helper function for HashMap
-    fn assert_has_keys_hashmap<T>(map: &HashMap<String, T>, keys: &[&str]) {
+    fn assert_has_keys_hashmap(map: &serde_json::Map<String, _>, keys: &[&str]) {
         for &key in keys {
             assert!(map.contains_key(key), "Key {} is missing", key);
         }
@@ -103,13 +103,22 @@ mod test {
 
             let (client, _, _) = setup_daemon(harness_ctx).await;
 
-            let response: HashMap<String, Vec<(Uuid, String)>> = client
+            let response: HashMap<String, Vec<Value>> = client
                 .request("get_history", ObjectParams::new())
                 .await
                 .unwrap();
-            let swaps: Vec<(Uuid, String)> = vec![(bob_swap_id, "btc is locked".to_string())];
 
-            assert_eq!(response, HashMap::from([("swaps".to_string(), swaps)]));
+            let swaps = response.get("swaps").unwrap();
+            assert_eq!(swaps.len(), 1);
+            assert_has_keys_hashmap(swaps[0].as_object().unwrap(), &[
+                "swapId",
+                "startDate",
+                "state",
+                "btcAmount",
+                "xmrAmount",
+                "exchangeRate",
+                "tradingPartnerPeerId"
+            ]);
 
             let response: HashMap<String, HashMap<Uuid, Vec<Value>>> = client
                 .request("get_raw_states", ObjectParams::new())