From e5d4aa0ebe4be5dc177534d5743ea65fcc861338 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Thu, 29 Feb 2024 18:47:13 -0400 Subject: [PATCH] chore: rename messageId to messageHash --- waku-bindings/src/general/mod.rs | 4 ++-- waku-bindings/src/lib.rs | 4 +++- waku-bindings/src/node/events.rs | 8 ++++---- waku-bindings/src/node/mod.rs | 4 ++-- waku-bindings/src/node/relay.rs | 4 ++-- waku-bindings/tests/node.rs | 16 ++++++++-------- waku-sys/vendor | 2 +- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/waku-bindings/src/general/mod.rs b/waku-bindings/src/general/mod.rs index 82ca5f7..bd880a7 100644 --- a/waku-bindings/src/general/mod.rs +++ b/waku-bindings/src/general/mod.rs @@ -11,8 +11,8 @@ use sscanf::{scanf, RegexRepresentation}; /// Waku message version pub type WakuMessageVersion = usize; -/// Waku message id, hex encoded sha256 digest of the message -pub type MessageId = String; +/// Waku message hash, hex encoded sha256 digest of the message +pub type MessageHash = String; /// Waku response, just a `Result` with an `String` error. pub type Result = std::result::Result; diff --git a/waku-bindings/src/lib.rs b/waku-bindings/src/lib.rs index b5253ec..7d268f6 100644 --- a/waku-bindings/src/lib.rs +++ b/waku-bindings/src/lib.rs @@ -16,4 +16,6 @@ pub use node::{ SecretKey, WakuMessageEvent, WakuNodeConfig, WakuNodeHandle, }; -pub use general::{Encoding, MessageId, Result, WakuContentTopic, WakuMessage, WakuMessageVersion}; +pub use general::{ + Encoding, MessageHash, Result, WakuContentTopic, WakuMessage, WakuMessageVersion, +}; diff --git a/waku-bindings/src/node/events.rs b/waku-bindings/src/node/events.rs index e9ead24..fd71b7a 100644 --- a/waku-bindings/src/node/events.rs +++ b/waku-bindings/src/node/events.rs @@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize}; use crate::general::WakuMessage; use crate::node::context::WakuNodeContext; use crate::utils::{get_trampoline, LibwakuResponse}; -use crate::MessageId; +use crate::MessageHash; /// Waku event /// For now just WakuMessage is supported @@ -31,8 +31,8 @@ pub enum Event { pub struct WakuMessageEvent { /// The pubsub topic on which the message was received pub pubsub_topic: String, - /// The message id - pub message_id: MessageId, + /// The message hash + pub message_hash: MessageHash, /// The message in [`WakuMessage`] format pub waku_message: WakuMessage, } @@ -62,7 +62,7 @@ mod tests { #[test] fn deserialize_message_event() { - let s = "{\"eventType\":\"message\",\"messageId\":\"0x26ff3d7fbc950ea2158ce62fd76fd745eee0323c9eac23d0713843b0f04ea27c\",\"pubsubTopic\":\"/waku/2/default-waku/proto\",\"wakuMessage\":{\"payload\":\"SGkgZnJvbSDwn6aAIQ==\",\"contentTopic\":\"/toychat/2/huilong/proto\",\"timestamp\":1665580926660}}"; + let s = "{\"eventType\":\"message\",\"messageHash\":\"0x26ff3d7fbc950ea2158ce62fd76fd745eee0323c9eac23d0713843b0f04ea27c\",\"pubsubTopic\":\"/waku/2/default-waku/proto\",\"wakuMessage\":{\"payload\":\"SGkgZnJvbSDwn6aAIQ==\",\"contentTopic\":\"/toychat/2/huilong/proto\",\"timestamp\":1665580926660}}"; let evt: Event = serde_json::from_str(s).unwrap(); assert!(matches!(evt, Event::WakuMessage(_))); } diff --git a/waku-bindings/src/node/mod.rs b/waku-bindings/src/node/mod.rs index 2073c4a..c5d4105 100644 --- a/waku-bindings/src/node/mod.rs +++ b/waku-bindings/src/node/mod.rs @@ -14,7 +14,7 @@ pub use secp256k1::{PublicKey, SecretKey}; use std::marker::PhantomData; use std::time::Duration; // internal -use crate::general::{MessageId, Result, WakuMessage}; +use crate::general::{MessageHash, Result, WakuMessage}; use context::WakuNodeContext; pub use config::WakuNodeConfig; @@ -97,7 +97,7 @@ impl WakuNodeHandle { message: &WakuMessage, pubsub_topic: &String, timeout: Option, - ) -> Result { + ) -> Result { relay::waku_relay_publish_message(&self.ctx, message, pubsub_topic, timeout) } diff --git a/waku-bindings/src/node/relay.rs b/waku-bindings/src/node/relay.rs index 8fd1aaa..e42caf4 100644 --- a/waku-bindings/src/node/relay.rs +++ b/waku-bindings/src/node/relay.rs @@ -6,7 +6,7 @@ use std::time::Duration; // crates use libc::*; // internal -use crate::general::{Encoding, MessageId, Result, WakuContentTopic, WakuMessage}; +use crate::general::{Encoding, MessageHash, Result, WakuContentTopic, WakuMessage}; use crate::node::context::WakuNodeContext; use crate::utils::{get_trampoline, handle_no_response, handle_response, LibwakuResponse}; @@ -62,7 +62,7 @@ pub fn waku_relay_publish_message( message: &WakuMessage, pubsub_topic: &String, timeout: Option, -) -> Result { +) -> Result { let pubsub_topic = pubsub_topic.to_string(); let message_ptr = CString::new( diff --git a/waku-bindings/tests/node.rs b/waku-bindings/tests/node.rs index 9b6467c..7d33dfc 100644 --- a/waku-bindings/tests/node.rs +++ b/waku-bindings/tests/node.rs @@ -7,7 +7,7 @@ use tokio::sync::broadcast::{self, Sender}; use tokio::time; use tokio::time::sleep; use waku_bindings::{ - waku_new, Encoding, Event, MessageId, Running, WakuContentTopic, WakuMessage, WakuNodeConfig, + waku_new, Encoding, Event, MessageHash, Running, WakuContentTopic, WakuMessage, WakuNodeConfig, WakuNodeHandle, }; const ECHO_TIMEOUT: u64 = 10; @@ -17,7 +17,7 @@ const TEST_PUBSUBTOPIC: &str = "test"; fn try_publish_relay_messages( node: &WakuNodeHandle, msg: &WakuMessage, -) -> Result, String> { +) -> Result, String> { let topic = TEST_PUBSUBTOPIC.to_string(); Ok(HashSet::from([ node.relay_publish_message(msg, &topic, None)? @@ -26,19 +26,19 @@ fn try_publish_relay_messages( #[derive(Debug, Clone)] struct Response { - id: MessageId, + hash: MessageHash, payload: Vec, } fn set_callback(node: &WakuNodeHandle, tx: Sender) { node.set_event_callback(move |event| { if let Event::WakuMessage(message) = event { - let id = message.message_id; + let hash = message.message_hash; let message = message.waku_message; let payload = message.payload.to_vec(); tx.send(Response { - id: id.to_string(), + hash: hash.to_string(), payload, }) .expect("send response to the receiver"); @@ -73,7 +73,7 @@ async fn test_echo_messages( let mut ids = try_publish_relay_messages(node1, &message).expect("send relay messages"); while let Ok(res) = rx.recv().await { - if ids.take(&res.id).is_some() { + if ids.take(&res.hash).is_some() { let msg = from_utf8(&res.payload).expect("should be valid message"); assert_eq!(content, msg); } @@ -108,7 +108,7 @@ async fn default_echo() -> Result<(), String> { node2.relay_subscribe(&topic)?; // Wait for mesh to form - sleep(Duration::from_secs(5)).await; + sleep(Duration::from_secs(3)).await; let content_topic = WakuContentTopic::new("toychat", "2", "huilong", Encoding::Proto); @@ -145,6 +145,6 @@ fn node_restart() { let node = node.start().expect("node should start with valid config"); - let node = node.stop().expect("node should stop"); + node.stop().expect("node should stop"); } } diff --git a/waku-sys/vendor b/waku-sys/vendor index d8e379b..91e3f8c 160000 --- a/waku-sys/vendor +++ b/waku-sys/vendor @@ -1 +1 @@ -Subproject commit d8e379be6a0483e865f360e8104bba00cb1a1549 +Subproject commit 91e3f8cde61b8ef3ca4332710b9ec9d7bc4fb786