first steps torwards openid auth

1 files changed, 3 insertions, 5 deletions

diff --git a/src/main.rs b/src/main.rs
index a13d171..0dcf01b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,6 @@
 pub mod certs;
 pub mod config;
 pub mod error;
-pub mod helper;
 pub mod modules;
 
 use aes_gcm_siv::{aead::generic_array::GenericArray, Aes256GcmSiv, KeyInit};
@@ -14,7 +13,6 @@ use certs::CertPool;
 use config::{setup_file_watch, Config, NODE_KINDS};
 use error::ServiceError;
 use futures::future::try_join_all;
-use helper::TokioIo;
 use http_body_util::{combinators::BoxBody, BodyExt};
 use hyper::{
     body::Incoming,
@@ -23,7 +21,7 @@ use hyper::{
     service::service_fn,
     Request, Response, StatusCode, Uri,
 };
-use hyper_util::rt::TokioExecutor;
+use hyper_util::rt::{TokioExecutor, TokioIo};
 use log::{debug, error, info, warn, LevelFilter};
 use modules::{NodeContext, MODULES};
 use std::{
@@ -126,7 +124,7 @@ async fn serve_http(state: Arc<State>) -> Result<()> {
         loop {
             let (stream, addr) = l.accept().await.context("accepting connection")?;
             debug!("connection from {addr}");
-            let stream = TokioIo(stream);
+            let stream = TokioIo::new(stream);
             let state = state.clone();
             tokio::spawn(async move { serve_stream(state, stream, addr).await });
         }
@@ -164,7 +162,7 @@ async fn serve_https(state: Arc<State>) -> Result<()> {
             tokio::task::spawn(async move {
                 debug!("connection from {addr}");
                 match tls_acceptor.accept(stream).await {
-                    Ok(stream) => serve_stream(state, TokioIo(stream), addr).await,
+                    Ok(stream) => serve_stream(state, TokioIo::new(stream), addr).await,
                     Err(e) => warn!("error accepting tls: {e}"),
                 };
             });