bugfix: add runtime to ffi::listen (#512)

* rm async listen * bump version
RingsNetwork · Jan 2, 2024 · ccfe2cf · ccfe2cf
1 parent e54f870
commit ccfe2cf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["core", "transport", "node", "rpc", "derive"]
 
 [workspace.package]
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 license = "GPL-3.0"
 authors = ["RND <dev@ringsnetwork.io>"]

diff --git a/examples/ffi/rings.h b/examples/ffi/rings.h
@@ -76,14 +76,6 @@ void init_logging(enum LogLevel level);
  */
 void listen(const struct ProviderPtr *provider_ptr);
 
-/**
- * Start message listening and stabilization
- * This function will launch listener in a new thread
- * # Safety
- * Listen function accept a ProviderPtr and will unsafety cast it into Arc based Provider
- */
-void async_listen(const struct ProviderPtr *provider_ptr);
-
 /**
  * Request internal rpc api
  * # Safety

diff --git a/examples/ffi/rings.py b/examples/ffi/rings.py
@@ -66,7 +66,7 @@ def create_provider(acc,
         gen_signer(acc),
         ffi.addressof(callback),
     )
-    rings.async_listen(ffi.addressof(provider))
+    rings.listen(ffi.addressof(provider))
     return provider
 
 

diff --git a/node/src/provider/ffi.rs b/node/src/provider/ffi.rs
@@ -160,26 +160,18 @@ impl From<&ProviderWithRuntime> for ProviderPtr {
     }
 }
 
-/// Start message listening and stabilization
-/// # Safety
-/// Listen function accept a ProviderPtr and will unsafety cast it into Arc based Provider
-#[no_mangle]
-pub extern "C" fn listen(provider_ptr: *const ProviderPtr) {
-    let provider: ProviderWithRuntime =
-        ProviderWithRuntime::from_raw(provider_ptr).expect("Provider ptr is invalid");
-    executor::block_on(provider.provider.processor.listen());
-}
-
 /// Start message listening and stabilization
 /// This function will launch listener in a new thread
 /// # Safety
 /// Listen function accept a ProviderPtr and will unsafety cast it into Arc based Provider
 #[no_mangle]
-pub extern "C" fn async_listen(provider_ptr: *const ProviderPtr) {
+pub extern "C" fn listen(provider_ptr: *const ProviderPtr) {
     let provider: ProviderWithRuntime =
         ProviderWithRuntime::from_raw(provider_ptr).expect("Provider ptr is invalid");
     std::thread::spawn(move || {
-        executor::block_on(provider.provider.processor.listen());
+        provider.runtime.block_on(async {
+            provider.provider.processor.listen().await;
+        })
     });
 }
 

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "RND <dev@ringsnetwork.io>"
   ],
   "description": "Rings is a structured peer-to-peer network implementation using WebRTC, Chord algorithm, and full WebAssembly (WASM) support.\n",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "license": "GPL-3.0",
   "repository": {
     "type": "git",