re-style few archive modules with nph-0.5.1

waku-org · Mar 15, 2024 · 1ff0085 · 1ff0085
1 parent b7637b6
commit 1ff0085
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 95 deletions.
diff --git a/tests/waku_archive/test_driver_postgres.nim b/tests/waku_archive/test_driver_postgres.nim
@@ -1,9 +1,6 @@
 {.used.}
 
-import
-  std/[sequtils,options],
-  testutils/unittests,
-  chronos
+import std/[sequtils, options], testutils/unittests, chronos
 import
   ../../../waku/waku_archive,
   ../../../waku/waku_archive/driver/postgres_driver,
@@ -13,9 +10,7 @@ import
   ../testlib/testasync,
   ../testlib/postgres
 
-proc computeTestCursor(pubsubTopic: PubsubTopic,
-                       message: WakuMessage):
-                       ArchiveCursor =
+proc computeTestCursor(pubsubTopic: PubsubTopic, message: WakuMessage): ArchiveCursor =
   ArchiveCursor(
     pubsubTopic: pubsubTopic,
     senderTime: message.timestamp,
@@ -60,12 +55,14 @@ suite "Postgres driver":
   asyncTest "Insert a message":
     const contentTopic = "test-content-topic"
 
-    let msg = fakeWakuMessage(contentTopic=contentTopic)
+    let msg = fakeWakuMessage(contentTopic = contentTopic)
 
     let computedDigest = computeDigest(msg)
     let computedHash = computeMessageHash(DefaultPubsubTopic, msg)
 
-    let putRes = await driver.put(DefaultPubsubTopic, msg, computedDigest, computedHash, msg.timestamp)
+    let putRes = await driver.put(
+      DefaultPubsubTopic, msg, computedDigest, computedHash, msg.timestamp
+    )
     assert putRes.isOk(), putRes.error
 
     let storedMsg = (await driver.getAllMessages()).tryGet()
@@ -85,14 +82,26 @@ suite "Postgres driver":
     const pubsubTopic1 = "pubsubtopic-1"
     const pubsubTopic2 = "pubsubtopic-2"
 
-    let msg1 = fakeWakuMessage(contentTopic=contentTopic1)
+    let msg1 = fakeWakuMessage(contentTopic = contentTopic1)
 
-    var putRes = await driver.put(pubsubTopic1, msg1, computeDigest(msg1), computeMessageHash(pubsubTopic1, msg1), msg1.timestamp)
+    var putRes = await driver.put(
+      pubsubTopic1,
+      msg1,
+      computeDigest(msg1),
+      computeMessageHash(pubsubTopic1, msg1),
+      msg1.timestamp,
+    )
     assert putRes.isOk(), putRes.error
 
-    let msg2 = fakeWakuMessage(contentTopic=contentTopic2)
+    let msg2 = fakeWakuMessage(contentTopic = contentTopic2)
 
-    putRes = await driver.put(pubsubTopic2, msg2, computeDigest(msg2), computeMessageHash(pubsubTopic2, msg2), msg2.timestamp)
+    putRes = await driver.put(
+      pubsubTopic2,
+      msg2,
+      computeDigest(msg2),
+      computeMessageHash(pubsubTopic2, msg2),
+      msg2.timestamp,
+    )
     assert putRes.isOk(), putRes.error
 
     let countMessagesRes = await driver.getMessagesCount()
@@ -106,46 +115,44 @@ suite "Postgres driver":
     assert messagesRes.get().len == 1
 
     # Get both content topics, check ordering
-    messagesRes = await driver.getMessages(contentTopic = @[contentTopic1,
-                                                            contentTopic2])
+    messagesRes =
+      await driver.getMessages(contentTopic = @[contentTopic1, contentTopic2])
     assert messagesRes.isOk(), messagesRes.error
 
     assert messagesRes.get().len == 2
     assert messagesRes.get()[0][1].contentTopic == contentTopic1
 
     # Descending order
-    messagesRes = await driver.getMessages(contentTopic = @[contentTopic1,
-                                                            contentTopic2],
-                                           ascendingOrder = false)
+    messagesRes = await driver.getMessages(
+      contentTopic = @[contentTopic1, contentTopic2], ascendingOrder = false
+    )
     assert messagesRes.isOk(), messagesRes.error
 
     assert messagesRes.get().len == 2
     assert messagesRes.get()[0][1].contentTopic == contentTopic2
 
     # cursor
     # Get both content topics
-    messagesRes =
-        await driver.getMessages(contentTopic = @[contentTopic1,
-                                                  contentTopic2],
-                                 cursor = some(
-                                        computeTestCursor(pubsubTopic1,
-                                                          messagesRes.get()[1][1])))
+    messagesRes = await driver.getMessages(
+      contentTopic = @[contentTopic1, contentTopic2],
+      cursor = some(computeTestCursor(pubsubTopic1, messagesRes.get()[1][1])),
+    )
     assert messagesRes.isOk()
     assert messagesRes.get().len == 1
 
     # Get both content topics but one pubsub topic
-    messagesRes = await driver.getMessages(contentTopic = @[contentTopic1,
-                                                            contentTopic2],
-                                           pubsubTopic = some(pubsubTopic1))
+    messagesRes = await driver.getMessages(
+      contentTopic = @[contentTopic1, contentTopic2], pubsubTopic = some(pubsubTopic1)
+    )
     assert messagesRes.isOk(), messagesRes.error
 
     assert messagesRes.get().len == 1
     assert messagesRes.get()[0][1].contentTopic == contentTopic1
 
     # Limit
-    messagesRes = await driver.getMessages(contentTopic = @[contentTopic1,
-                                                            contentTopic2],
-                                           maxPageSize = 1)
+    messagesRes = await driver.getMessages(
+      contentTopic = @[contentTopic1, contentTopic2], maxPageSize = 1
+    )
     assert messagesRes.isOk(), messagesRes.error
     assert messagesRes.get().len == 1
 
@@ -160,22 +167,33 @@ suite "Postgres driver":
     let initialNumMsgs = (await driver.getMessagesCount()).valueOr:
       raiseAssert "could not get num mgs correctly: " & $error
 
-    var putRes = await driver.put(DefaultPubsubTopic,
-                                  msg1, computeDigest(msg1), computeMessageHash(DefaultPubsubTopic, msg1), msg1.timestamp)
+    var putRes = await driver.put(
+      DefaultPubsubTopic,
+      msg1,
+      computeDigest(msg1),
+      computeMessageHash(DefaultPubsubTopic, msg1),
+      msg1.timestamp,
+    )
     assert putRes.isOk(), putRes.error
 
     var newNumMsgs = (await driver.getMessagesCount()).valueOr:
       raiseAssert "could not get num mgs correctly: " & $error
 
-    assert newNumMsgs == (initialNumMsgs + 1.int64), "wrong number of messages: " & $newNumMsgs
+    assert newNumMsgs == (initialNumMsgs + 1.int64),
+      "wrong number of messages: " & $newNumMsgs
 
-    putRes = await driver.put(DefaultPubsubTopic,
-                              msg2, computeDigest(msg2), computeMessageHash(DefaultPubsubTopic, msg2), msg2.timestamp)
+    putRes = await driver.put(
+      DefaultPubsubTopic,
+      msg2,
+      computeDigest(msg2),
+      computeMessageHash(DefaultPubsubTopic, msg2),
+      msg2.timestamp,
+    )
 
     assert putRes.isOk()
 
     newNumMsgs = (await driver.getMessagesCount()).valueOr:
       raiseAssert "could not get num mgs correctly: " & $error
 
-    assert newNumMsgs == (initialNumMsgs + 1.int64), "wrong number of messages: " & $newNumMsgs
-
+    assert newNumMsgs == (initialNumMsgs + 1.int64),
+      "wrong number of messages: " & $newNumMsgs