Update wtx

LesnyRumcajs · Sep 20, 2024 · cebedd3 · cebedd3
1 parent 38875a7
commit cebedd3
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 83 deletions.
diff --git a/rust_wtx_bench/Cargo.lock b/rust_wtx_bench/Cargo.lock
diff --git a/rust_wtx_bench/Cargo.toml b/rust_wtx_bench/Cargo.toml
@@ -5,7 +5,7 @@ path = "src/main.rs"
 [dependencies]
 quick-protobuf = { default-features = false, version = "0.8" }
 tokio = { default-features = false, features = ["parking_lot", "rt-multi-thread"], version = "1.0" }
-wtx = { default-features = false, features = ["grpc", "optimization", "quick-protobuf"], version = "0.17" }
+wtx = { default-features = false, features = ["grpc", "optimization", "quick-protobuf"], version = "0.19" }
 
 [build-dependencies]
 pb-rs = { default-features = false, version = "0.10" }

diff --git a/rust_wtx_bench/src/main.rs b/rust_wtx_bench/src/main.rs
@@ -2,34 +2,33 @@ pub mod grpc_bindings;
 
 use wtx::{
     data_transformation::dnsn::QuickProtobuf,
-    grpc::{GrpcStatusCode, Server, ServerData},
+    grpc::{GrpcManager, GrpcStatusCode},
     http::{
-        server_framework::{post, Router},
-        ReqResBuffer, Request, StatusCode,
+        server_framework::{post, Router, ServerFrameworkBuilder, State},
+        ReqResBuffer, StatusCode,
     },
 };
 
 fn main() -> wtx::Result<()> {
-    let cpus = std::env::var("GRPC_SERVER_CPUS")
-        .ok()
-        .and_then(|var| var.parse().ok())
-        .unwrap_or(1);
     tokio::runtime::Builder::new_multi_thread()
-        .worker_threads(cpus)
+        .worker_threads(std::env::var("GRPC_SERVER_CPUS")?.parse()?)
         .enable_all()
         .build()?
         .block_on(async move {
             let router = Router::paths(wtx::paths!((
                 "/helloworld.Greeter/SayHello",
                 post(say_hello)
-            ),));
-            Server::new(router).listen("0.0.0.0:50051", |_| {}).await
+            )))?;
+            ServerFrameworkBuilder::new(router)
+                .with_req_aux(|| QuickProtobuf::default())
+                .listen("0.0.0.0:50051", |_| {})
+                .await
         })
 }
 
 async fn say_hello(
-    _: &mut Request<ReqResBuffer>,
-    _: ServerData<QuickProtobuf>,
-) -> wtx::Result<(StatusCode, GrpcStatusCode)> {
-    Ok((StatusCode::Ok, GrpcStatusCode::Ok))
+    state: State<'_, (), GrpcManager<QuickProtobuf>, ReqResBuffer>,
+) -> wtx::Result<StatusCode> {
+    *state.ra.status_code_mut() = GrpcStatusCode::Ok;
+    Ok(StatusCode::Ok)
 }