From 8219d290c0473c66a23810098756f8551e9feba8 Mon Sep 17 00:00:00 2001
From: Daniel Sanchez Quiros <sanchez.quiros.daniel@gmail.com>
Date: Mon, 10 Oct 2022 11:07:40 -0500
Subject: [PATCH] Use optional timeout on publish messages

---
 waku/src/node/mod.rs   |  2 +-
 waku/src/node/relay.rs | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/waku/src/node/mod.rs b/waku/src/node/mod.rs
index c482bda..72ad005 100644
--- a/waku/src/node/mod.rs
+++ b/waku/src/node/mod.rs
@@ -159,7 +159,7 @@ impl WakuNodeHandle<Running> {
         &self,
         message: &WakuMessage,
         pubsub_topic: Option<WakuPubSubTopic>,
-        timeout: Duration,
+        timeout: Option<Duration>,
     ) -> Result<MessageId> {
         relay::waku_relay_publish_message(message, pubsub_topic, timeout)
     }
diff --git a/waku/src/node/relay.rs b/waku/src/node/relay.rs
index b4abd76..2ca3aa0 100644
--- a/waku/src/node/relay.rs
+++ b/waku/src/node/relay.rs
@@ -74,7 +74,7 @@ pub fn waku_dafault_pubsub_topic() -> WakuPubSubTopic {
 pub fn waku_relay_publish_message(
     message: &WakuMessage,
     pubsub_topic: Option<WakuPubSubTopic>,
-    timeout: Duration,
+    timeout: Option<Duration>,
 ) -> Result<MessageId> {
     let pubsub_topic = pubsub_topic
         .unwrap_or_else(waku_dafault_pubsub_topic)
@@ -91,9 +91,13 @@ pub fn waku_relay_publish_message(
                 .expect("CString should build properly from pubsub topic")
                 .into_raw(),
             timeout
-                .as_millis()
-                .try_into()
-                .expect("Duration as milliseconds should fit in a i32"),
+                .map(|duration| {
+                    duration
+                        .as_millis()
+                        .try_into()
+                        .expect("Duration as milliseconds should fit in a i32")
+                })
+                .unwrap_or(0),
         ))
     }
     .to_str()