From 5c14b4328c1c7ea35faf721bce0a32dc9c9c3ff2 Mon Sep 17 00:00:00 2001
From: SionoiS <simvivier@status.im>
Date: Tue, 9 Jul 2024 16:14:17 -0400
Subject: [PATCH] misc. fixes

---
 tests/waku_sync/sync_utils.nim  | 2 +-
 waku/waku_sync/protocol.nim     | 2 +-
 waku/waku_sync/raw_bindings.nim | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/waku_sync/sync_utils.nim b/tests/waku_sync/sync_utils.nim
index 236bc987b9..f437339b11 100644
--- a/tests/waku_sync/sync_utils.nim
+++ b/tests/waku_sync/sync_utils.nim
@@ -2,7 +2,7 @@
 
 import std/options, chronos, chronicles, libp2p/crypto/crypto
 
-import ../../../waku/[node/peer_manager, waku_core, waku_sync], ../testlib/wakucore
+import waku/[node/peer_manager, waku_core, waku_sync], ../testlib/wakucore
 
 proc newTestWakuSync*(
     switch: Switch,
diff --git a/waku/waku_sync/protocol.nim b/waku/waku_sync/protocol.nim
index 0de8a0d759..273ed66418 100644
--- a/waku/waku_sync/protocol.nim
+++ b/waku/waku_sync/protocol.nim
@@ -356,7 +356,7 @@ proc new*(
 
   let res = await sync.initFillStorage(wakuArchive)
   if res.isErr():
-    return err("initial storage filling error: " & res.error)
+    error "initial storage filling failed", error = res.error
 
   info "WakuSync protocol initialized"
 
diff --git a/waku/waku_sync/raw_bindings.nim b/waku/waku_sync/raw_bindings.nim
index 5aa57ae8d7..c629e20b40 100644
--- a/waku/waku_sync/raw_bindings.nim
+++ b/waku/waku_sync/raw_bindings.nim
@@ -5,7 +5,7 @@ else:
 
 from os import DirSep
 
-import std/[strutils], chronicles, std/options, stew/[results, byteutils], confutils
+import std/[strutils], chronicles, std/options, stew/byteutils, confutils, results
 import ../waku_core/message
 
 const negentropyPath =
@@ -271,7 +271,7 @@ type
 
   NegentropyPayload* = distinct seq[byte]
 
-method delete*(self: Negentropy) {.base.} =
+method delete*(self: Negentropy) {.base, gcsafe.} =
   discard
 
 method initiate*(self: Negentropy): Result[NegentropyPayload, string] {.base.} =