Migration to 0.3 & Async/Await

crates/interledger-ildcp/Cargo.toml

@@ -10,8 +10,13 @@ repository = "https://github.com/interledger-rs/interledger-rs"
 [dependencies]
 bytes = { version = "0.4.12", default-features = false }
 byteorder = { version = "1.3.2", default-features = false }
-futures = { version = "0.1.29", default-features = false }
+futures = { version = "0.3", default-features = false }
 interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
 interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false }
 log = { version = "0.4.8", default-features = false }
+async-trait = "0.1.22"
+
+[dev-dependencies]
+tokio = { version = "0.2.6", features = ["macros","rt-core"]}
+uuid = { version = "0.8.1", features = ["v4"] }

crates/interledger-ildcp/src/client.rs

@@ -1,34 +1,30 @@
 use super::packet::*;
-use futures::Future;
+use futures::future::TryFutureExt;
 use interledger_service::*;
 use log::{debug, error};
 use std::convert::TryFrom;
 
 /// Get the ILP address and asset details for a given account.
-pub fn get_ildcp_info<S, A>(
-    service: &mut S,
-    account: A,
-) -> impl Future<Item = IldcpResponse, Error = ()>
+pub async fn get_ildcp_info<S, A>(service: &mut S, account: A) -> Result<IldcpResponse, ()>
 where
     S: IncomingService<A>,
     A: Account,
 {
     let prepare = IldcpRequest {}.to_prepare();
-    service
+    let fulfill = service
         .handle_request(IncomingRequest {
             from: account,
             prepare,
         })
         .map_err(|err| error!("Error getting ILDCP info: {:?}", err))
-        .and_then(|fulfill| {
-            let response =
-                IldcpResponse::try_from(fulfill.into_data().freeze()).map_err(|err| {
-                    error!(
-                        "Unable to parse ILDCP response from fulfill packet: {:?}",
-                        err
-                    );
-                })?;
-            debug!("Got ILDCP response: {:?}", response);
-            Ok(response)
-        })
+        .await?;
+
+    let response = IldcpResponse::try_from(fulfill.into_data().freeze()).map_err(|err| {
+        error!(
+            "Unable to parse ILDCP response from fulfill packet: {:?}",
+            err
+        );
+    })?;
+    debug!("Got ILDCP response: {:?}", response);
+    Ok(response)
 }