From 03187ccb6cc57e534ef4a7f1a9af4bfd29672279 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Quiros Date: Thu, 29 Sep 2022 18:50:22 +0200 Subject: [PATCH] Use optional config in waku_new --- waku/src/node_management/config.rs | 2 +- waku/src/node_management/node.rs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/waku/src/node_management/config.rs b/waku/src/node_management/config.rs index 6eeaa13..b1d5c61 100644 --- a/waku/src/node_management/config.rs +++ b/waku/src/node_management/config.rs @@ -5,7 +5,7 @@ use multiaddr::Multiaddr; use serde::{Deserialize, Serialize}; // internal -#[derive(Serialize, Deserialize, Default)] +#[derive(Clone, Default, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct NodeConfig { host: Option, diff --git a/waku/src/node_management/node.rs b/waku/src/node_management/node.rs index 7366e1a..aaa51da 100644 --- a/waku/src/node_management/node.rs +++ b/waku/src/node_management/node.rs @@ -8,8 +8,9 @@ use crate::general::{JsonResponse, Result}; /// Instantiates a Waku node /// as per the [specification](https://rfc.vac.dev/spec/36/#extern-char-waku_newchar-jsonconfig) -pub fn waku_new(config: &NodeConfig) -> Result { - let s_config = serde_json::to_string(config) +pub fn waku_new(config: Option) -> Result { + let config = config.unwrap_or_default(); + let s_config = serde_json::to_string(&config) .expect("Serialization from properly built NodeConfig should never fail"); let result: &str = unsafe { CStr::from_ptr(waku_sys::waku_new(