Tests: Use yaml needs funding in swap test

sedited · sedited · commit c945a62e0951 · 2022-11-04T21:49:43.000+01:00
diff --git a/tests/swap.rs b/tests/swap.rs
@@ -3,8 +3,8 @@ extern crate log;
 
 use bitcoincore_rpc::RpcApi;
 use farcaster_core::swap::SwapId;
-use farcaster_node::bus::ctl::{BitcoinFundingInfo, MoneroFundingInfo};
-use farcaster_node::bus::rpc::NodeInfo;
+use farcaster_node::bus::ctl::{BitcoinFundingInfo, MoneroFundingInfo, FundingInfo};
+use farcaster_node::bus::rpc::{NodeInfo, FundingInfos};
 use farcaster_node::bus::CheckpointEntry;
 use futures::future::join_all;
 use std::collections::HashSet;
@@ -2731,6 +2731,13 @@ fn cli_output_to_node_info(stdout: Vec<String>) -> NodeInfo {
     .unwrap()
 }
 
+fn cli_output_to_funding_infos(stdout: Vec<String>) -> FundingInfos {
+    serde_yaml::from_str(
+        &stdout.iter().map(|line| format!("{}{}", line, "\n"))
+            .collect::<String>(),
+    ).unwrap()
+}
+
 async fn retry_until_offer(args: Vec<String>) -> Vec<String> {
     for _ in 0..ALLOWED_RETRIES {
         let (stdout, _stderr) = run("../swap-cli", args.clone()).unwrap();
@@ -2875,22 +2882,17 @@ async fn retry_until_bitcoin_funding_address(
     for _ in 0..ALLOWED_RETRIES {
         let (stdout, _stderr) = run("../swap-cli", args.clone()).unwrap();
 
-        // get the btc funding address
-        let funding_infos: Vec<BitcoinFundingInfo> = stdout
-            .iter()
-            .filter_map(|element| {
-                info!("cli: {}", element);
-                if let Ok(funding_info) = BitcoinFundingInfo::from_str(element) {
-                    if funding_info.swap_id == swap_id {
-                        Some(funding_info)
-                    } else {
-                        None
-                    }
+        let funding_infos: Vec<BitcoinFundingInfo> = cli_output_to_funding_infos(stdout).swaps_need_funding.iter().filter_map(|f|
+            if let FundingInfo::Bitcoin(info) = f {
+                if info.swap_id == swap_id {
+                    Some(info)
+
                 } else {
                     None
                 }
-            })
-            .collect();
+            } else {
+                None
+            }).cloned().collect();
 
         if !funding_infos.is_empty() {
             return (funding_infos[0].address.clone(), funding_infos[0].amount);
@@ -2904,22 +2906,24 @@ async fn retry_until_funding_info_cleared(swap_id: SwapId, args: Vec<String>) {
     for _ in 0..ALLOWED_RETRIES {
         let (stdout, _stderr) = run("../swap-cli", args.clone()).unwrap();
 
-        // get the btc funding address
-        let funding_infos: Vec<BitcoinFundingInfo> = stdout
-            .iter()
-            .filter_map(|element| {
-                info!("cli: {}", element);
-                if let Ok(funding_info) = BitcoinFundingInfo::from_str(element) {
-                    if funding_info.swap_id == swap_id {
-                        Some(funding_info)
+        let funding_infos: Vec<FundingInfo> = cli_output_to_funding_infos(stdout).swaps_need_funding.iter().filter_map(|f|
+            match f {
+                FundingInfo::Bitcoin(info) => {
+                    if info.swap_id == swap_id {
+                        Some(FundingInfo::Bitcoin(info.clone()))
                     } else {
                         None
                     }
-                } else {
-                    None
                 }
-            })
-            .collect();
+                FundingInfo::Monero(info) => {
+                    if info.swap_id == swap_id {
+                        Some(FundingInfo::Monero(info.clone()))
+                    } else {
+                        None
+                    }
+                }
+            }
+        ).collect();
 
         if funding_infos.is_empty() {
             return;
@@ -2935,23 +2939,16 @@ async fn retry_until_monero_funding_address(
 ) -> (monero::Address, monero::Amount) {
     for _ in 0..ALLOWED_RETRIES {
         let (stdout, _stderr) = run("../swap-cli", args.clone()).unwrap();
-
-        // get the monero funding address
-        let funding_infos: Vec<MoneroFundingInfo> = stdout
-            .iter()
-            .filter_map(|element| {
-                info!("cli: {}", element);
-                if let Ok(funding_info) = MoneroFundingInfo::from_str(element) {
-                    if funding_info.swap_id == swap_id {
-                        Some(funding_info)
-                    } else {
-                        None
-                    }
+        let funding_infos: Vec<MoneroFundingInfo> = cli_output_to_funding_infos(stdout).swaps_need_funding.iter().filter_map(|f|
+            if let FundingInfo::Monero(info) = f {
+                if info.swap_id == swap_id {
+                    Some(info)
                 } else {
                     None
                 }
-            })
-            .collect();
+            } else {
+                None
+            }).cloned().collect();
 
         if !funding_infos.is_empty() {
             return (funding_infos[0].address, funding_infos[0].amount);
