From 8f741de483a0dd4ac180dc634191b1060ebd2737 Mon Sep 17 00:00:00 2001
From: Sanaz Taheri Boshrooyeh <35961250+staheri14@users.noreply.github.com>
Date: Fri, 28 May 2021 11:41:29 -0700
Subject: [PATCH] A quick fix to the master issue (#579)

* moves resume to after the relay is mounted

* Update waku/v2/node/wakunode2.nim

Co-authored-by: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com>

Co-authored-by: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com>
---
 waku/v2/node/wakunode2.nim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 62c5a641b..97fd503fc 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -703,8 +703,6 @@ when isMainModule:
     if conf.storenode != "":
       setStorePeer(node, conf.storenode)
     
-    if conf.persistMessages:
-      waitFor node.resume()
 
 
   # Relay setup
@@ -713,6 +711,10 @@ when isMainModule:
              rlnRelayEnabled = conf.rlnRelay,
              keepAlive = conf.keepAlive,
              relayMessages = conf.relay) # Indicates if node is capable to relay messages
+  
+  # Resume historical messages, this has to be called after the relay setup           
+  if conf.store and conf.persistMessages:
+    waitFor node.resume()
 
   if conf.staticnodes.len > 0:
     waitFor connectToNodes(node, conf.staticnodes)
@@ -761,4 +763,4 @@ when isMainModule:
     
     c_signal(SIGTERM, handleSigterm)
 
-  runForever()
\ No newline at end of file
+  runForever()