feat(settlement/api): Upgrade the settlement client

This gets consumed by the balance service

Author: gakonst

crates/interledger-settlement/src/api/client.rs

@@ -1,11 +1,8 @@
 use crate::core::types::{Quantity, SettlementAccount};
-use futures::{
-    future::{err, Either},
-    Future,
-};
+use futures::TryFutureExt;
 use interledger_service::Account;
 use log::{debug, error, trace};
-use reqwest::r#async::Client;
+use reqwest::Client;
 use serde_json::json;
 use uuid::Uuid;
 
@@ -21,11 +18,11 @@ impl SettlementClient {
         }
     }
 
-    pub fn send_settlement<A: SettlementAccount + Account>(
+    pub async fn send_settlement<A: SettlementAccount + Account>(
         &self,
         account: A,
         amount: u64,
-    ) -> impl Future<Item = (), Error = ()> {
+    ) -> Result<(), ()> {
         if let Some(settlement_engine) = account.settlement_engine_details() {
             let mut settlement_engine_url = settlement_engine.url;
             settlement_engine_url
@@ -40,23 +37,37 @@ impl SettlementClient {
             );
             let settlement_engine_url_clone = settlement_engine_url.clone();
             let idempotency_uuid = Uuid::new_v4().to_hyphenated().to_string();
-            return Either::A(self.http_client.post(settlement_engine_url.as_ref())
+            let response = self
+                .http_client
+                .post(settlement_engine_url.as_ref())
                 .header("Idempotency-Key", idempotency_uuid)
                 .json(&json!(Quantity::new(amount, account.asset_scale())))
                 .send()
-                .map_err(move |err| error!("Error sending settlement command to settlement engine {}: {:?}", settlement_engine_url, err))
-                .and_then(move |response| {
-                    if response.status().is_success() {
-                        trace!("Sent settlement of {} to settlement engine: {}", amount, settlement_engine_url_clone);
-                        Ok(())
-                    } else {
-                        error!("Error sending settlement. Settlement engine responded with HTTP code: {}", response.status());
-                        Err(())
-                    }
-                }));
+                .map_err(move |err| {
+                    error!(
+                        "Error sending settlement command to settlement engine {}: {:?}",
+                        settlement_engine_url, err
+                    )
+                })
+                .await?;
+
+            if response.status().is_success() {
+                trace!(
+                    "Sent settlement of {} to settlement engine: {}",
+                    amount,
+                    settlement_engine_url_clone
+                );
+                return Ok(());
+            } else {
+                error!(
+                    "Error sending settlement. Settlement engine responded with HTTP code: {}",
+                    response.status()
+                );
+                return Err(());
+            }
         }
         error!("Cannot send settlement for account {} because it does not have the settlement_engine_url and scale configured", account.id());
-        Either::B(err(()))
+        Err(())
     }
 }
 
@@ -70,37 +81,37 @@ impl Default for SettlementClient {
 mod tests {
     use super::*;
     use crate::api::fixtures::TEST_ACCOUNT_0;
-    use crate::api::test_helpers::{block_on, mock_settlement};
+    use crate::api::test_helpers::mock_settlement;
     use mockito::Matcher;
 
-    #[test]
-    fn settlement_ok() {
+    #[tokio::test]
+    async fn settlement_ok() {
         let m = mock_settlement(200)
             .match_header("Idempotency-Key", Matcher::Any)
             .create();
         let client = SettlementClient::new();
 
-        let ret = block_on(client.send_settlement(TEST_ACCOUNT_0.clone(), 100));
+        let ret = client.send_settlement(TEST_ACCOUNT_0.clone(), 100).await;
 
         m.assert();
         assert!(ret.is_ok());
     }
 
-    #[test]
-    fn engine_rejects() {
+    #[tokio::test]
+    async fn engine_rejects() {
         let m = mock_settlement(500)
             .match_header("Idempotency-Key", Matcher::Any)
             .create();
         let client = SettlementClient::new();
 
-        let ret = block_on(client.send_settlement(TEST_ACCOUNT_0.clone(), 100));
+        let ret = client.send_settlement(TEST_ACCOUNT_0.clone(), 100).await;
 
         m.assert();
         assert!(ret.is_err());
     }
 
-    #[test]
-    fn account_does_not_have_settlement_engine() {
+    #[tokio::test]
+    async fn account_does_not_have_settlement_engine() {
         let m = mock_settlement(200)
             .expect(0)
             .match_header("Idempotency-Key", Matcher::Any)
@@ -109,7 +120,7 @@ mod tests {
 
         let mut acc = TEST_ACCOUNT_0.clone();
         acc.no_details = true; // Hide the settlement engine data from the account
-        let ret = block_on(client.send_settlement(acc, 100));
+        let ret = client.send_settlement(acc, 100).await;
 
         m.assert();
         assert!(ret.is_err());