Hide tonic internals in GrpcServer.

Author: twittner

timeboost/src/api/internal.rs

@@ -1,20 +1,36 @@
+use std::{io, net::SocketAddr};
+
 use proto::internal::internal_api_server::InternalApi;
 use timeboost_builder::{CertifierDown, Handle};
 use timeboost_types::Block;
 use tonic::{Request, Response, Status};
 
-use timeboost_proto as proto;
+use timeboost_proto::{self as proto, internal::internal_api_server::InternalApiServer};
 
-pub struct InternalApiService {
-    block_handler: Handle,
+pub struct GrpcServer {
+    service: InternalApiService,
 }
 
-impl InternalApiService {
+impl GrpcServer {
     pub fn new(block_handler: Handle) -> Self {
-        Self { block_handler }
+        Self {
+            service: InternalApiService { block_handler },
+        }
+    }
+
+    pub async fn serve(self, addr: SocketAddr) -> io::Result<()> {
+        tonic::transport::Server::builder()
+            .add_service(InternalApiServer::new(self.service))
+            .serve(addr)
+            .await
+            .map_err(io::Error::other)
     }
 }
 
+struct InternalApiService {
+    block_handler: Handle,
+}
+
 #[tonic::async_trait]
 impl InternalApi for InternalApiService {
     async fn submit_block(&self, r: Request<proto::block::Block>) -> Result<Response<()>, Status> {

timeboost/src/lib.rs

@@ -7,7 +7,6 @@ use anyhow::Result;
 use metrics::TimeboostMetrics;
 use multisig::PublicKey;
 use timeboost_builder::{Certifier, CertifierDown, Submitter};
-use timeboost_proto::internal::internal_api_server::InternalApiServer;
 use timeboost_sequencer::{Output, Sequencer};
 use timeboost_types::BundleVariant;
 use timeboost_utils::types::prometheus::PrometheusMetrics;
@@ -23,7 +22,7 @@ pub use timeboost_sequencer as sequencer;
 pub use timeboost_types as types;
 
 use crate::api::ApiServer;
-use crate::api::internal::InternalApiService;
+use crate::api::internal::GrpcServer;
 use crate::forwarder::nitro_forwarder::NitroForwarder;
 
 pub mod api;
@@ -82,9 +81,8 @@ impl Timeboost {
             .build()
     }
 
-    pub fn internal_grpc_api(&self) -> tonic::transport::server::Router {
-        let svc = InternalApiService::new(self.certifier.handle());
-        tonic::transport::Server::builder().add_service(InternalApiServer::new(svc))
+    pub fn internal_grpc_api(&self) -> GrpcServer {
+        GrpcServer::new(self.certifier.handle())
     }
 
     pub async fn go(mut self) -> Result<()> {