From aa9a74c60bb809c04936843ad9ea1cda2c292fec Mon Sep 17 00:00:00 2001
From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com>
Date: Tue, 30 Mar 2021 15:33:19 +0200
Subject: [PATCH] Fix nil error when starting wakunode2 with store/filter node
 (#441)

---
 waku/v2/node/wakunode2.nim | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 228bf17b2..1ad853949 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -581,7 +581,8 @@ when isMainModule:
 
   # TODO Set swap peer, for now should be same as store peer
 
-  if conf.store:
+  # Store setup
+  if (conf.storenode != "") or (conf.store):
     var store: WakuMessageStore
 
     if not sqliteDatabase.isNil:
@@ -594,20 +595,22 @@ when isMainModule:
 
     mountStore(node, store)
 
-  if conf.filter:
+    if conf.storenode != "":
+      setStorePeer(node, conf.storenode)
+
+  # Filter setup
+  if (conf.filternode != "") or (conf.filter):
     mountFilter(node)
 
-  if conf.relay:
+    if conf.filternode != "":
+      setFilterPeer(node, conf.filternode)
+
+  # Relay setup
+  if conf.relay:  # True by default
     mountRelay(node, conf.topics.split(" "), rlnRelayEnabled = conf.rlnrelay)
 
-  if conf.staticnodes.len > 0:
-    waitFor connectToNodes(node, conf.staticnodes)
-
-  if conf.storenode != "":
-    setStorePeer(node, conf.storenode)
-
-  if conf.filternode != "":
-    setFilterPeer(node, conf.filternode)
+    if conf.staticnodes.len > 0:
+      waitFor connectToNodes(node, conf.staticnodes)
 
   if conf.rpc:
     startRpc(node, conf.rpcAddress, Port(conf.rpcPort + conf.portsShift), conf)