diff --git a/examples/toy-chat/src/main.rs b/examples/toy-chat/src/main.rs index 5e21c9f..749ae7a 100644 --- a/examples/toy-chat/src/main.rs +++ b/examples/toy-chat/src/main.rs @@ -69,8 +69,8 @@ fn retrieve_history( let peer = node_handle .peers()? .iter() + .find(|&peer| peer.peer_id() != &self_id) .cloned() - .find(|peer| peer.peer_id() != &self_id) .unwrap(); let result = node_handle.store_query( diff --git a/waku-bindings/src/node/relay.rs b/waku-bindings/src/node/relay.rs index dd5415c..255c6da 100644 --- a/waku-bindings/src/node/relay.rs +++ b/waku-bindings/src/node/relay.rs @@ -15,16 +15,16 @@ use crate::utils::{get_trampoline, handle_json_response, handle_no_response, han /// As per the [specification](https://rfc.vac.dev/spec/36/#extern-char-waku_content_topicchar-applicationname-unsigned-int-applicationversion-char-contenttopicname-char-encoding) pub fn waku_create_content_topic( application_name: &str, - application_version: usize, + application_version: &str, content_topic_name: &str, encoding: Encoding, ) -> WakuContentTopic { let application_name_ptr = CString::new(application_name) .expect("Application name should always transform to CString") .into_raw(); - let application_version = application_version - .try_into() - .expect("Version should fit within an u32"); + let application_version_ptr = CString::new(application_version) + .expect("Application version should always transform to CString") + .into_raw(); let content_topic_name_ptr = CString::new(content_topic_name) .expect("Content topic should always transform to CString") .into_raw(); @@ -39,7 +39,7 @@ pub fn waku_create_content_topic( let cb = get_trampoline(&closure); let out = waku_sys::waku_content_topic( application_name_ptr, - application_version, + application_version_ptr, content_topic_name_ptr, encoding_ptr, cb, @@ -47,6 +47,7 @@ pub fn waku_create_content_topic( ); drop(CString::from_raw(application_name_ptr)); + drop(CString::from_raw(application_version_ptr)); drop(CString::from_raw(content_topic_name_ptr)); drop(CString::from_raw(encoding_ptr)); diff --git a/waku-sys/vendor b/waku-sys/vendor index 02f2800..e340337 160000 --- a/waku-sys/vendor +++ b/waku-sys/vendor @@ -1 +1 @@ -Subproject commit 02f2800b046094f73d1011081daef7d897126687 +Subproject commit e340337d64622d22cb94a969255efe4e36637df0