feat(postgresql): 1st commit to async sql (waku_archive/driver...) (#…

…1755)
waku-org · May 25, 2023 · 59ca03a · 59ca03a
1 parent 3c2d289
commit 59ca03a
Show file tree

Hide file tree

Showing 23 changed files with 526 additions and 486 deletions.
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
@@ -552,7 +552,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
       await node.mountFilterClient()
       node.peerManager.addServicePeer(peerInfo.value, WakuFilterCodec)
 
-      proc filterHandler(pubsubTopic: PubsubTopic, msg: WakuMessage) {.gcsafe.} =
+      proc filterHandler(pubsubTopic: PubsubTopic, msg: WakuMessage) {.async, gcsafe, closure.} =
         trace "Hit filter handler", contentTopic=msg.contentTopic
         chat.printReceivedMessage(msg)
 

diff --git a/tests/v2/test_waku_filter.nim b/tests/v2/test_waku_filter.nim
@@ -54,7 +54,7 @@ suite "Waku Filter":
     let serverAddr = serverSwitch.peerInfo.toRemotePeerInfo()
 
     let pushHandlerFuture = newFuture[(string, WakuMessage)]()
-    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.gcsafe, closure.} =
+    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.async, gcsafe, closure.} =
       pushHandlerFuture.complete((pubsubTopic, message))
 
     let
@@ -97,7 +97,7 @@ suite "Waku Filter":
     let serverAddr = serverSwitch.peerInfo.toRemotePeerInfo()
 
     var pushHandlerFuture = newFuture[void]()
-    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.gcsafe, closure.} =
+    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.async, gcsafe, closure.} =
       pushHandlerFuture.complete()
 
     let
@@ -149,7 +149,7 @@ suite "Waku Filter":
     let serverAddr = serverSwitch.peerInfo.toRemotePeerInfo()
 
     var pushHandlerFuture = newFuture[void]()
-    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.gcsafe, closure.} =
+    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.async, gcsafe, closure.} =
       pushHandlerFuture.complete()
 
     let
@@ -214,7 +214,7 @@ suite "Waku Filter":
     let serverAddr = serverSwitch.peerInfo.toRemotePeerInfo()
 
     var pushHandlerFuture = newFuture[void]()
-    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.gcsafe, closure.} =
+    proc pushHandler(pubsubTopic: PubsubTopic, message: WakuMessage) {.async, gcsafe, closure.} =
       pushHandlerFuture.complete()
 
     let

diff --git a/tests/v2/test_wakunode_filter.nim b/tests/v2/test_wakunode_filter.nim
@@ -25,10 +25,10 @@ suite "WakuNode - Filter":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, ValidIpAddress.init("0.0.0.0"), Port(0))
 
-    await allFutures(server.start(), client.start())
+    waitFor allFutures(server.start(), client.start())
 
-    await server.mountFilter()
-    await client.mountFilterClient()
+    waitFor server.mountFilter()
+    waitFor client.mountFilterClient()
 
     ## Given
     let serverPeerInfo = server.peerInfo.toRemotePeerInfo()
@@ -39,18 +39,18 @@ suite "WakuNode - Filter":
       message = fakeWakuMessage(contentTopic=contentTopic)
 
     var filterPushHandlerFut = newFuture[(PubsubTopic, WakuMessage)]()
-    proc filterPushHandler(pubsubTopic: PubsubTopic, msg: WakuMessage) {.gcsafe, closure.} =
+    proc filterPushHandler(pubsubTopic: PubsubTopic, msg: WakuMessage) {.async, gcsafe, closure.} =
       filterPushHandlerFut.complete((pubsubTopic, msg))
 
     ## When
     await client.filterSubscribe(pubsubTopic, contentTopic, filterPushHandler, peer=serverPeerInfo)
 
     # Wait for subscription to take effect
-    await sleepAsync(100.millis)
+    waitFor sleepAsync(100.millis)
 
-    await server.filterHandleMessage(pubSubTopic, message)
+    waitFor server.filterHandleMessage(pubSubTopic, message)
 
-    require await filterPushHandlerFut.withTimeout(5.seconds)
+    require waitFor filterPushHandlerFut.withTimeout(5.seconds)
 
     ## Then
     check filterPushHandlerFut.completed()
@@ -60,4 +60,4 @@ suite "WakuNode - Filter":
       filterMessage == message
 
     ## Cleanup
-    await allFutures(client.stop(), server.stop())
+    waitFor allFutures(client.stop(), server.stop())