only mounting rlnRelay if relay is configured

waku-org · Jul 12, 2024 · 2f298e9 · 2f298e9
1 parent e269dca
commit 2f298e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/examples/wakustealthcommitments/node_spec.nim b/examples/wakustealthcommitments/node_spec.nim
@@ -1,7 +1,6 @@
 {.push raises: [].}
 
-import
-  waku/[common/logging, factory/[waku, networks_config, external_config]]
+import waku/[common/logging, factory/[waku, networks_config, external_config]]
 import
   std/[options, strutils, os, sequtils],
   stew/shims/net as stewNet,
@@ -35,7 +34,6 @@ proc setup*(): Waku =
   # Override configuration
   conf.maxMessageSize = twnClusterConf.maxMessageSize
   conf.clusterId = twnClusterConf.clusterId
-  conf.rlnRelay = twnClusterConf.rlnRelay
   conf.rlnRelayEthContractAddress = twnClusterConf.rlnRelayEthContractAddress
   conf.rlnRelayDynamic = twnClusterConf.rlnRelayDynamic
   conf.rlnRelayBandwidthThreshold = twnClusterConf.rlnRelayBandwidthThreshold
@@ -45,6 +43,10 @@ proc setup*(): Waku =
   conf.rlnEpochSizeSec = twnClusterConf.rlnEpochSizeSec
   conf.rlnRelayUserMessageLimit = twnClusterConf.rlnRelayUserMessageLimit
 
+  # Only set rlnRelay to true if relay is configured
+  if conf.relay:
+    conf.rlnRelay = twnClusterConf.rlnRelay
+
   debug "Starting node"
   var waku = Waku.init(conf).valueOr:
     error "Waku initialization failed", error = error

diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
@@ -115,6 +115,10 @@ proc init*(T: type Waku, conf: WakuNodeConf): Result[Waku, string] =
       confCopy.discv5BootstrapNodes & twnClusterConf.discv5BootstrapNodes
     confCopy.rlnEpochSizeSec = twnClusterConf.rlnEpochSizeSec
     confCopy.rlnRelayUserMessageLimit = twnClusterConf.rlnRelayUserMessageLimit
+
+    # Only set rlnRelay to true if relay is configured
+    if confCopy.relay:
+      confCopy.rlnRelay = twnClusterConf.rlnRelay
   else:
     discard