From 7a5071fb2a3e4fb32eef87758b258af1786e8a5d Mon Sep 17 00:00:00 2001
From: jm-clius <jm-clius@users.noreply.github.com>
Date: Wed, 23 Mar 2022 13:57:21 +0000
Subject: [PATCH] deploy: 7c40f452793b6106d5a353218ef1d7b0bb84fddb

---
 waku/common/wakubridge.nim           | 6 +++---
 waku/v2/node/jsonrpc/admin_api.nim   | 2 +-
 waku/v2/node/jsonrpc/debug_api.nim   | 2 +-
 waku/v2/node/jsonrpc/filter_api.nim  | 2 +-
 waku/v2/node/jsonrpc/private_api.nim | 2 +-
 waku/v2/node/jsonrpc/relay_api.nim   | 2 +-
 waku/v2/node/jsonrpc/store_api.nim   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index e400495ff..955906738 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -104,14 +104,14 @@ proc toV1Topic*(contentTopic: ContentTopic): waku_protocol.Topic {.raises: [Defe
 
 # Message conversion
 
-func toWakuMessage(env: Envelope): WakuMessage =
+func toWakuMessage(env: waku_protocol.Envelope): WakuMessage =
   # Translate a Waku v1 envelope to a Waku v2 message
   WakuMessage(payload: env.data,
               contentTopic: toV2ContentTopic(env.topic),
               timestamp: (getNanosecondTime(env.expiry) - getNanosecondTime(env.ttl)),
               version: 1)
 
-proc toWakuV2(bridge: WakuBridge, env: Envelope) {.async.} =
+proc toWakuV2(bridge: WakuBridge, env: waku_protocol.Envelope) {.async.} =
   let msg = env.toWakuMessage()
 
   if bridge.seen.containsOrAdd(msg.encode().buffer.hash()):
@@ -224,7 +224,7 @@ proc start*(bridge: WakuBridge) {.async.} =
 
   # Bridging
   # Handle messages on Waku v1 and bridge to Waku v2  
-  proc handleEnvReceived(envelope: Envelope) {.gcsafe, raises: [Defect].} =
+  proc handleEnvReceived(envelope: waku_protocol.Envelope) {.gcsafe, raises: [Defect].} =
     trace "Bridging envelope from V1 to V2", envelope=envelope
     asyncSpawn bridge.toWakuV2(envelope)
 
diff --git a/waku/v2/node/jsonrpc/admin_api.nim b/waku/v2/node/jsonrpc/admin_api.nim
index fb6e4a2b0..96f9487df 100644
--- a/waku/v2/node/jsonrpc/admin_api.nim
+++ b/waku/v2/node/jsonrpc/admin_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[options, sequtils, sets],
diff --git a/waku/v2/node/jsonrpc/debug_api.nim b/waku/v2/node/jsonrpc/debug_api.nim
index c6c8986c5..0b3810d4c 100644
--- a/waku/v2/node/jsonrpc/debug_api.nim
+++ b/waku/v2/node/jsonrpc/debug_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   chronicles,
diff --git a/waku/v2/node/jsonrpc/filter_api.nim b/waku/v2/node/jsonrpc/filter_api.nim
index 6c5b593ba..9d0ba174c 100644
--- a/waku/v2/node/jsonrpc/filter_api.nim
+++ b/waku/v2/node/jsonrpc/filter_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/private_api.nim b/waku/v2/node/jsonrpc/private_api.nim
index c70bc36cc..eec46c38e 100644
--- a/waku/v2/node/jsonrpc/private_api.nim
+++ b/waku/v2/node/jsonrpc/private_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/relay_api.nim b/waku/v2/node/jsonrpc/relay_api.nim
index f7253bd12..b75b7021b 100644
--- a/waku/v2/node/jsonrpc/relay_api.nim
+++ b/waku/v2/node/jsonrpc/relay_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/store_api.nim b/waku/v2/node/jsonrpc/store_api.nim
index 5b3e99abb..95b7168c3 100644
--- a/waku/v2/node/jsonrpc/store_api.nim
+++ b/waku/v2/node/jsonrpc/store_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/options,