Merge pull request #36 from UnstoppableSwap/fix-rpc-tests

refactor(cli): Refactor RPC server and fix tests
UnstoppableSwap · Aug 28, 2024 · aac366f · aac366f
2 parents ca25e04 + 66d1e7d
commit aac366f
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 339 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/monero-harness/Cargo.toml b/monero-harness/Cargo.toml
@@ -13,4 +13,4 @@ rand = "0.7"
 testcontainers = "0.15"
 tokio = { version = "1", default-features = false, features = [ "rt-multi-thread", "time", "macros" ] }
 tracing = "0.1"
-tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "tracing-log" ] }
+tracing-subscriber = { version = "0.3", default-features = false, features = [ "fmt", "ansi", "env-filter", "tracing-log" ] }
diff --git a/monero-wallet/Cargo.toml b/monero-wallet/Cargo.toml
@@ -16,4 +16,4 @@ monero-harness = { path = "../monero-harness" }
 rand = "0.7"
 testcontainers = "0.15"
 tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs" ] }
-tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "chrono", "tracing-log" ] }
+tracing-subscriber = { version = "0.3", default-features = false, features = [ "fmt", "ansi", "env-filter", "chrono", "tracing-log" ] }
diff --git a/swap/sqlx-data.json b/swap/sqlx-data.json
@@ -80,30 +80,6 @@
     },
     "query": "\n        insert into peers (\n            swap_id,\n            peer_id\n            ) values (?, ?);\n        "
   },
-  "3f2bfdd2d134586ccad22171cd85a465800fc5c4fdaf191d206974e530240c87": {
-    "describe": {
-      "columns": [
-        {
-          "name": "swap_id",
-          "ordinal": 0,
-          "type_info": "Text"
-        },
-        {
-          "name": "state",
-          "ordinal": 1,
-          "type_info": "Text"
-        }
-      ],
-      "nullable": [
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 0
-      }
-    },
-    "query": "\n                SELECT swap_id, state\n                FROM swap_states\n                "
-  },
   "50a5764546f69c118fa0b64120da50f51073d36257d49768de99ff863e3511e0": {
     "describe": {
       "columns": [],

diff --git a/swap/src/cli/api.rs b/swap/src/cli/api.rs
@@ -507,7 +507,6 @@ pub mod api_test {
             Self {
                 tor_socks5_port: 9050,
                 namespace: XmrBtcNamespace::from_is_testnet(is_testnet),
-                server_address: None,
                 env_config,
                 seed: Some(seed),
                 debug,

diff --git a/swap/src/cli/api/request.rs b/swap/src/cli/api/request.rs
@@ -304,9 +304,9 @@ impl Request for SuspendCurrentSwapArgs {
     }
 }
 
-pub struct GetCurrentSwap;
+pub struct GetCurrentSwapArgs;
 
-impl Request for GetCurrentSwap {
+impl Request for GetCurrentSwapArgs {
     type Response = serde_json::Value;
 
     async fn request(self, ctx: Arc<Context>) -> Result<Self::Response> {
@@ -860,13 +860,6 @@ pub async fn get_history(context: Arc<Context>) -> Result<GetHistoryResponse> {
     Ok(GetHistoryResponse { swaps: vec })
 }
 
-#[tracing::instrument(fields(method = "get_raw_states"), skip(context))]
-pub async fn get_raw_states(context: Arc<Context>) -> Result<serde_json::Value> {
-    let raw_history = context.db.raw_all().await?;
-
-    Ok(json!({ "raw_states": raw_history }))
-}
-
 #[tracing::instrument(fields(method = "get_config"), skip(context))]
 pub async fn get_config(context: Arc<Context>) -> Result<serde_json::Value> {
     let data_dir_display = context.config.data_dir.display();
@@ -1164,7 +1157,7 @@ where
                         min_deposit_until_swap_will_start,
                         max_deposit_until_maximum_amount_is_reached,
                         min_bitcoin_lock_tx_fee,
-                        quote: bid_quote.clone(),
+                        quote: bid_quote,
                     },
                 );
             }

diff --git a/swap/src/database/sqlite.rs b/swap/src/database/sqlite.rs
@@ -6,7 +6,6 @@ use async_trait::async_trait;
 use libp2p::{Multiaddr, PeerId};
 use sqlx::sqlite::Sqlite;
 use sqlx::{Pool, SqlitePool};
-use std::collections::HashMap;
 use std::path::Path;
 use std::str::FromStr;
 use time::OffsetDateTime;
@@ -352,36 +351,6 @@ impl Database for SqliteDatabase {
 
         Ok(Some(proof))
     }
-
-    async fn raw_all(&self) -> Result<HashMap<Uuid, Vec<serde_json::Value>>> {
-        let mut conn = self.pool.acquire().await?;
-        let rows = sqlx::query!(
-            r#"
-                SELECT swap_id, state
-                FROM swap_states
-                "#
-        )
-        .fetch_all(&mut conn)
-        .await?;
-
-        let mut swaps: HashMap<Uuid, Vec<serde_json::Value>> = HashMap::new();
-
-        for row in &rows {
-            let swap_id = Uuid::from_str(&row.swap_id)?;
-            let state = serde_json::from_str(&row.state)?;
-
-            if let std::collections::hash_map::Entry::Vacant(e) = swaps.entry(swap_id) {
-                e.insert(vec![state]);
-            } else {
-                swaps
-                    .get_mut(&swap_id)
-                    .ok_or_else(|| anyhow!("Error while retrieving the swap"))?
-                    .push(state);
-            }
-        }
-
-        Ok(swaps)
-    }
 }
 
 #[cfg(test)]

diff --git a/swap/src/protocol.rs b/swap/src/protocol.rs
@@ -11,7 +11,6 @@ use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use sigma_fun::ext::dl_secp256k1_ed25519_eq::{CrossCurveDLEQ, CrossCurveDLEQProof};
 use sigma_fun::HashTranscript;
-use std::collections::HashMap;
 use std::convert::TryInto;
 use uuid::Uuid;
 
@@ -145,7 +144,6 @@ pub trait Database {
     async fn get_state(&self, swap_id: Uuid) -> Result<State>;
     async fn get_states(&self, swap_id: Uuid) -> Result<Vec<State>>;
     async fn all(&self) -> Result<Vec<(Uuid, State)>>;
-    async fn raw_all(&self) -> Result<HashMap<Uuid, Vec<serde_json::Value>>>;
     async fn insert_buffered_transfer_proof(
         &self,
         swap_id: Uuid,