Streamline APIs.

Author: twittner

timeboost/src/api.rs

@@ -12,7 +12,10 @@ use http::{Request, Response, StatusCode};
 use timeboost_crypto::prelude::{ThresholdEncKey, ThresholdEncKeyCell};
 use timeboost_types::{Bundle, BundleVariant, SignedPriorityBundle};
 use timeboost_utils::types::prometheus::PrometheusMetrics;
-use tokio::{net::TcpListener, sync::mpsc::Sender};
+use tokio::{
+    net::{TcpListener, ToSocketAddrs},
+    sync::mpsc::Sender,
+};
 use tower::ServiceBuilder;
 use tower_http::trace::TraceLayer;
 use tower_http::{ServiceBuilderExt, request_id::MakeRequestUuid};
@@ -62,8 +65,9 @@ impl ApiServer {
             )
     }
 
-    pub fn serve(self, listener: TcpListener) -> impl Future<Output = io::Result<()>> {
-        axum::serve(listener, self.router()).into_future()
+    pub async fn serve<A: ToSocketAddrs>(self, addr: A) -> io::Result<()> {
+        let listener = TcpListener::bind(addr).await?;
+        axum::serve(listener, self.router()).await
     }
 
     async fn health(this: State<Self>) -> StatusCode {

timeboost/src/api/internal.rs

@@ -1,8 +1,9 @@
-use std::{io, net::SocketAddr};
+use std::io;
 
 use proto::internal::internal_api_server::InternalApi;
 use timeboost_builder::{CertifierDown, Handle};
 use timeboost_types::Block;
+use tokio::net::{ToSocketAddrs, lookup_host};
 use tonic::{Request, Response, Status};
 
 use timeboost_proto::{self as proto, internal::internal_api_server::InternalApiServer};
@@ -18,7 +19,11 @@ impl GrpcServer {
         }
     }
 
-    pub async fn serve(self, addr: SocketAddr) -> io::Result<()> {
+    pub async fn serve<A: ToSocketAddrs>(self, addr: A) -> io::Result<()> {
+        let addr = lookup_host(addr)
+            .await?
+            .next()
+            .ok_or_else(|| io::Error::other("can not resolve grpc server address"))?;
         tonic::transport::Server::builder()
             .add_service(InternalApiServer::new(self.service))
             .serve(addr)

timeboost/src/binaries/timeboost.rs

@@ -7,7 +7,6 @@ use timeboost::{Timeboost, TimeboostConfig};
 use timeboost_builder::robusta;
 use timeboost_crypto::prelude::ThresholdEncKeyCell;
 use timeboost_types::DkgKeyStore;
-use tokio::net::{TcpListener, lookup_host};
 use tokio::select;
 use tokio::signal;
 use tokio::task::spawn;
@@ -231,18 +230,11 @@ async fn main() -> Result<()> {
     let timeboost = Timeboost::new(config).await?;
 
     let mut grpc = {
-        let addr = my_keyset.internal_address.clone();
-        let addr = lookup_host(addr.to_string())
-            .await?
-            .next()
-            .ok_or_else(|| anyhow!("{} does not resolve to a socket address", addr))?;
+        let addr = my_keyset.internal_address.to_string();
         spawn(timeboost.internal_grpc_api().serve(addr))
     };
 
-    let mut api = {
-        let listener = TcpListener::bind(format!("0.0.0.0:{}", cli.http_port)).await?;
-        spawn(timeboost.api().serve(listener))
-    };
+    let mut api = spawn(timeboost.api().serve(format!("0.0.0.0:{}", cli.http_port)));
 
     for peer in sailfish_peer_hosts_and_keys {
         let p = peer.2.port();