From 12e1cfd486d8f1fa792270d0b4a92e226e88dd63 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Quiros Date: Thu, 6 Oct 2022 17:58:33 +0200 Subject: [PATCH] Optional signing key on relay a/symmetric publish --- waku/src/node/mod.rs | 4 ++-- waku/src/node/relay.rs | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/waku/src/node/mod.rs b/waku/src/node/mod.rs index 6a4592e..3010900 100644 --- a/waku/src/node/mod.rs +++ b/waku/src/node/mod.rs @@ -160,7 +160,7 @@ impl WakuNodeHandle { message: &WakuMessage, pubsub_topic: Option, public_key: &PublicKey, - signing_key: &SecretKey, + signing_key: Option<&SecretKey>, timeout: Duration, ) -> Result { relay::waku_relay_publish_encrypt_asymmetric( @@ -180,7 +180,7 @@ impl WakuNodeHandle { message: &WakuMessage, pubsub_topic: Option, symmetric_key: &Key, - signing_key: &SecretKey, + signing_key: Option<&SecretKey>, timeout: Duration, ) -> Result { relay::waku_relay_publish_encrypt_symmetric( diff --git a/waku/src/node/relay.rs b/waku/src/node/relay.rs index 4bc01bb..1a80498 100644 --- a/waku/src/node/relay.rs +++ b/waku/src/node/relay.rs @@ -107,11 +107,13 @@ pub fn waku_relay_publish_encrypt_asymmetric( message: &WakuMessage, pubsub_topic: Option, public_key: &PublicKey, - signing_key: &SecretKey, + signing_key: Option<&SecretKey>, timeout: Duration, ) -> Result { let pk = hex::encode(public_key.serialize()); - let sk = hex::encode(signing_key.serialize()); + let sk = signing_key + .map(|signing_key| hex::encode(signing_key.serialize())) + .unwrap_or_else(String::new); let pubsub_topic = pubsub_topic .unwrap_or_else(waku_dafault_pubsub_topic) .to_string(); @@ -151,11 +153,13 @@ pub fn waku_relay_publish_encrypt_symmetric( message: &WakuMessage, pubsub_topic: Option, symmetric_key: &Key, - signing_key: &SecretKey, + signing_key: Option<&SecretKey>, timeout: Duration, ) -> Result { let symk = hex::encode(symmetric_key.as_slice()); - let sk = hex::encode(signing_key.serialize()); + let sk = signing_key + .map(|signing_key| hex::encode(signing_key.serialize())) + .unwrap_or_else(String::new); let pubsub_topic = pubsub_topic .unwrap_or_else(waku_dafault_pubsub_topic) .to_string();