fixup

fhevm-engine/Cargo.toml

@@ -11,7 +11,6 @@ bincode = "1.3.3"
 sha3 = "0.10.8"
 anyhow = "1.0.86"
 daggy = "0.8.0"
-futures = "0.3.30"
 
 [profile.dev.package.tfhe]
 overflow-checks = false

fhevm-engine/executor/Cargo.toml

@@ -17,7 +17,6 @@ bincode.workspace = true
 sha3.workspace = true
 anyhow.workspace = true
 daggy.workspace = true
-futures.workspace = true
 fhevm-engine-common = { path = "../fhevm-engine-common" }
 
 [build-dependencies]

fhevm-engine/executor/src/dfg/scheduler.rs

@@ -56,7 +56,7 @@ impl<'a, 'b> Scheduler<'a, 'b> {
             let output = result.map_err(|_| SyncComputeError::ComputationFailed)??;
             let index = output.0;
             let node_index = NodeIndex::new(index);
-            // Satisfy deps from the eecuted task
+            // Satisfy deps from the executed task
             for edge in self.edges.edges_directed(node_index, Direction::Outgoing) {
                 let child_index = edge.target();
                 let child_node = self.graph.node_weight_mut(child_index).unwrap();

fhevm-engine/executor/src/dfg/types.rs

@@ -1,35 +1,11 @@
-use daggy::NodeIndex;
-use futures::{future::BoxFuture, FutureExt};
-use std::{future::Future, task::Poll};
-
 use fhevm_engine_common::types::{Handle, SupportedFheCiphertexts};
 
-use crate::server::{InMemoryCiphertext, SyncComputeError};
+use crate::server::InMemoryCiphertext;
 
 pub type DFGTaskResult = Option<InMemoryCiphertext>;
 
-#[allow(variant_size_differences)]
 #[derive(Clone)]
 pub enum DFGTaskInput {
     Val(SupportedFheCiphertexts),
     Handle(Handle),
 }
-
-pub struct SchedTask<'a> {
-    pub idx: NodeIndex,
-    pub fut: BoxFuture<'a, Result<InMemoryCiphertext, SyncComputeError>>,
-}
-
-impl<'a> Future for SchedTask<'a> {
-    type Output = (NodeIndex, Result<InMemoryCiphertext, SyncComputeError>);
-
-    fn poll(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> Poll<Self::Output> {
-        match self.fut.poll_unpin(cx) {
-            Poll::Pending => Poll::Pending,
-            Poll::Ready(output) => Poll::Ready((self.idx, output)),
-        }
-    }
-}

fhevm-engine/executor/src/server.rs

@@ -21,6 +21,7 @@ use tokio::task::spawn_blocking;
 use tonic::{transport::Server, Code, Request, Response, Status};
 
 use crate::dfg::{scheduler::Scheduler, DFGraph};
+
 pub mod common {
     tonic::include_proto!("fhevm.common");
 }
@@ -104,7 +105,7 @@ impl FhevmExecutor for FhevmExecutorService {
             // Run the request's computations in an async block
             let handle = tokio::runtime::Handle::current();
             let _ = handle.enter();
-            let resp = futures::executor::block_on(async {
+            let resp = handle.block_on(async {
                 // Build the dataflow graph for this request
                 let mut graph = DFGraph::default();
                 if let Err(e) = graph.build_from_request(req, &state) {