feat(api): Migrate full API to 0.3 and async/await

Author: gakonst

Cargo.lock

@@ -27,7 +27,7 @@ interledger-btp = { path = "../interledger-btp", version = "^0.4.0", default-fea
 log = { version = "0.4.8", default-features = false }
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.41", default-features = false }
-serde_path_to_error = { version = "0.1", default-features = false }
+serde_path_to_error = { version = "0.1.2", default-features = false }
 reqwest = { version = "0.10", default-features = false, features = ["default-tls", "json"] }
 url = { version = "2.1.0", default-features = false, features = ["serde"] }
 uuid = { version = "0.8.1", default-features = false}
@@ -36,6 +36,7 @@ warp = { git = "https://github.com/seanmonstar/warp.git" }
 secrecy = { version = "0.5.2", default-features = false, features = ["serde"] }
 lazy_static = "1.4.0"
 async-trait = "0.1.22"
+mime = "0.3.16"
 
 [dev-dependencies]
 tokio = { version = "0.2.9", features = ["rt-core", "macros"] }

crates/interledger-api/Cargo.toml

@@ -1,6 +1,5 @@
 use async_trait::async_trait;
 use bytes::Bytes;
-use futures::Future;
 use interledger_btp::{BtpAccount, BtpOutgoingService};
 use interledger_ccp::CcpRoutingAccount;
 use interledger_http::{HttpAccount, HttpStore};
@@ -252,28 +251,26 @@ where
     }
 
     pub fn into_warp_filter(self) -> warp::filters::BoxedFilter<(impl warp::Reply,)> {
-        let routes = warp::any().map(|| "Hello, World!");
-        routes.boxed()
-        // routes::accounts_api(
-        //     self.server_secret,
-        //     self.admin_api_token.clone(),
-        //     self.default_spsp_account,
-        //     self.incoming_handler,
-        //     self.outgoing_handler,
-        //     self.btp,
-        //     self.store.clone(),
-        // )
-        // .or(routes::node_settings_api(
-        //     self.admin_api_token,
-        //     self.node_version,
-        //     self.store,
-        // ))
-        // .boxed()
+        routes::accounts_api(
+            self.server_secret,
+            self.admin_api_token.clone(),
+            self.default_spsp_account,
+            self.incoming_handler,
+            self.outgoing_handler,
+            self.btp,
+            self.store.clone(),
+        )
+        .or(routes::node_settings_api(
+            self.admin_api_token,
+            self.node_version,
+            self.store,
+        ))
+        .boxed()
     }
 
-    // pub fn bind(self, addr: SocketAddr) -> impl Future<Item = (), Error = ()> {
-    //     warp::serve(self.into_warp_filter()).bind(addr)
-    // }
+    pub async fn bind(self, addr: SocketAddr) {
+        warp::serve(self.into_warp_filter()).bind(addr).await
+    }
 }
 
 #[cfg(test)]