logos-messaging/logos-messaging-rust-bindings
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-rust-bindings.git synced 2026-01-07 16:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix clippy issues

Browse Source
This commit is contained in:
Ivan Folgueira Bande 2024-11-28 09:51:31 +01:00
parent 1ad70f5098
commit b8cf46abf0
No known key found for this signature in database
GPG Key ID: 3C117481F89E24A7
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/basic/src/main.rs
View File

@ -24,7 +24,7 @@ async fn main() -> Result<(), Error> {
// ======================================================================== // ========================================================================
// Setting an event callback to be executed each time a message is received // Setting an event callback to be executed each time a message is received
node2 node2
.set_event_callback(&|response| { .set_event_callback(|response| {
if let LibwakuResponse::Success(v) = response { if let LibwakuResponse::Success(v) = response {
let event: Event = let event: Event =
serde_json::from_str(v.unwrap().as_str()).expect("Parsing event to succeed"); serde_json::from_str(v.unwrap().as_str()).expect("Parsing event to succeed");
@ -47,7 +47,7 @@ async fn main() -> Result<(), Error> {
.expect("set event call back working"); .expect("set event call back working");
node1 node1
.set_event_callback(&|response| { .set_event_callback(|response| {
if let LibwakuResponse::Success(v) = response { if let LibwakuResponse::Success(v) = response {
let event: Event = let event: Event =
serde_json::from_str(v.unwrap().as_str()).expect("Parsing event to succeed"); serde_json::from_str(v.unwrap().as_str()).expect("Parsing event to succeed");

10
waku-bindings/src/node/context.rs
View File

@ -4,15 +4,17 @@ use std::sync::{Arc, Mutex};
use crate::utils::{get_trampoline, LibwakuResponse}; use crate::utils::{get_trampoline, LibwakuResponse};
type LibwakuResponseClosure = dyn FnMut(LibwakuResponse) + Send + Sync;
pub struct WakuNodeContext { pub struct WakuNodeContext {
obj_ptr: *mut c_void, obj_ptr: *mut c_void,
msg_observer: Arc<Mutex<Box<dyn FnMut(LibwakuResponse) + Send + Sync>>>, msg_observer: Arc<Mutex<Box<LibwakuResponseClosure>>>,
} }
impl WakuNodeContext { impl WakuNodeContext {
pub fn new(obj_ptr: *mut c_void) -> Self { pub fn new(obj_ptr: *mut c_void) -> Self {
let me = Self { let me = Self {
obj_ptr: obj_ptr, obj_ptr,
msg_observer: Arc::new(Mutex::new(Box::new(|_| {}))), msg_observer: Arc::new(Mutex::new(Box::new(|_| {}))),
}; };
@ -54,9 +56,7 @@ impl WakuNodeContext {
}; };
Ok(()) Ok(())
} else { } else {
Err(format!( Err("Failed to acquire lock in waku_set_event_callback!".to_string())
"Failed to acquire lock in waku_set_event_callback!"
))
} }
} }
} }

6
waku-bindings/src/node/filter.rs
View File

@ -89,13 +89,11 @@ pub fn waku_filter_unsubscribe_all(ctx: &WakuNodeContext) -> Result<()> {
let code = unsafe { let code = unsafe {
let mut closure = result_cb; let mut closure = result_cb;
let cb = get_trampoline(&closure); let cb = get_trampoline(&closure);
let out = waku_sys::waku_filter_unsubscribe_all( waku_sys::waku_filter_unsubscribe_all(
ctx.get_ptr(), ctx.get_ptr(),
cb, cb,
&mut closure as *mut _ as *mut c_void, &mut closure as *mut _ as *mut c_void,
); )
out
}; };
handle_no_response(code, result) handle_no_response(code, result)