From b90ad51723ada45a1dab9e1a5cffd3920c133827 Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Fri, 15 Aug 2025 08:22:55 -0700
Subject: [PATCH] more calling async from non-async changes

---
 rustybits/Cargo.lock |  1 -
 rustybits/Cargo.toml |  2 --
 rustybits/src/ext.rs | 20 ++++++--------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/rustybits/Cargo.lock b/rustybits/Cargo.lock
index c037e3695..fd6b37a34 100644
--- a/rustybits/Cargo.lock
+++ b/rustybits/Cargo.lock
@@ -3101,7 +3101,6 @@ dependencies = [
  "base64 0.21.7",
  "bytes",
  "cbindgen",
- "futures",
  "gcloud-gax",
  "gcloud-googleapis",
  "gcloud-pubsub",
diff --git a/rustybits/Cargo.toml b/rustybits/Cargo.toml
index 72b558c74..61888ab36 100644
--- a/rustybits/Cargo.toml
+++ b/rustybits/Cargo.toml
@@ -22,7 +22,6 @@ ztcontroller = [
     "dep:gcloud-googleapis",
     "dep:tokio",
     "dep:tokio-util",
-    "dep:futures",
 ]
 
 [dependencies]
@@ -57,7 +56,6 @@ prost = { version = "0.14", optional = true, features = ["derive"] }
 prost-types = { version = "0.14", optional = true }
 gcloud-gax = { version = "1.2.0", optional = true }
 gcloud-googleapis = { version = "1.2.0", optional = true }
-futures = { version = "0.3", optional = true }
 
 [dev-dependencies]
 testcontainers = { version = "0.24", features = ["blocking"] }
diff --git a/rustybits/src/ext.rs b/rustybits/src/ext.rs
index 1a21301cc..50962d785 100644
--- a/rustybits/src/ext.rs
+++ b/rustybits/src/ext.rs
@@ -530,8 +530,7 @@ pub unsafe extern "C" fn network_listener_new(
     let id = unsafe { CStr::from_ptr(controller_id) }.to_str().unwrap();
 
     let rt = runtime::Handle::current();
-    let _block = rt.enter();
-    futures::executor::block_on(async {
+    rt.block_on(async {
         match NetworkListener::new(id, Duration::from_secs(listen_timeout), callback, user_ptr).await {
             Ok(listener) => Arc::into_raw(listener),
             Err(e) => {
@@ -563,9 +562,7 @@ pub unsafe extern "C" fn network_listener_listen(ptr: *const NetworkListener) ->
     let listener = ManuallyDrop::new(unsafe { Arc::from_raw(ptr) });
 
     let rt = runtime::Handle::current();
-    let _guard = rt.enter();
-
-    match futures::executor::block_on(listener.listen()) {
+    match rt.block_on(listener.listen()) {
         Ok(_) => {
             println!("Network listener started successfully");
             true
@@ -589,9 +586,7 @@ pub unsafe extern "C" fn network_listener_change_handler(ptr: *const NetworkList
     let listener = ManuallyDrop::new(unsafe { Arc::from_raw(ptr) });
 
     let rt = runtime::Handle::current();
-    let _guard = rt.enter();
-
-    match futures::executor::block_on(listener.change_handler()) {
+    match rt.block_on(listener.change_handler()) {
         Ok(_) => {
             println!("Network listener change listener completed successfully");
         }
@@ -621,8 +616,7 @@ pub unsafe extern "C" fn member_listener_new(
     let id = unsafe { CStr::from_ptr(controller_id) }.to_str().unwrap();
 
     let rt = runtime::Handle::current();
-    let _block = rt.enter();
-    futures::executor::block_on(async {
+    rt.block_on(async {
         match MemberListener::new(id, Duration::from_secs(listen_timeout), callback, user_ptr).await {
             Ok(listener) => Arc::into_raw(listener),
             Err(e) => {
@@ -653,8 +647,7 @@ pub unsafe extern "C" fn member_listener_listen(ptr: *const MemberListener) -> b
 
     let listener = ManuallyDrop::new(unsafe { Arc::from_raw(ptr) });
     let rt = runtime::Handle::current();
-    let _guard = rt.enter();
-    match futures::executor::block_on(listener.listen()) {
+    match rt.block_on(listener.listen()) {
         Ok(_) => {
             println!("Member listener started successfully");
             true
@@ -678,8 +671,7 @@ pub unsafe extern "C" fn member_listener_change_handler(ptr: *const MemberListen
     let listener = ManuallyDrop::new(unsafe { Arc::from_raw(ptr) });
 
     let rt = runtime::Handle::current();
-    let _guard = rt.enter();
-    match futures::executor::block_on(listener.change_handler()) {
+    match rt.block_on(listener.change_handler()) {
         Ok(_) => {
             println!("Member listener change listener completed successfully");
         }