chore(store-archive): Remove duplicated code (#2234)

* Refactor utility functions for store and archive test.

tests/common/test_sqlite_migrations.nim

@@ -5,20 +5,18 @@ import
   stew/results,
   testutils/unittests
 import
-  ../../waku/common/databases/db_sqlite {.all.}
+  ../../waku/common/databases/db_sqlite {.all.},
+  ../waku_archive/archive_utils
 
 
-proc newTestDatabase(): SqliteDatabase =
-  SqliteDatabase.new(":memory:").tryGet()
-
 template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0]
 
 
 suite "SQLite - migrations":
 
   test "set and get user version":
     ## Given
-    let database = newTestDatabase()
+    let database = newSqliteDatabase()
 
     ## When
     let setRes = database.setUserVersion(5)

tests/node/test_wakunode_filter.nim

@@ -34,8 +34,6 @@ import
     testutils
   ]
 
-let FUTURE_TIMEOUT = 1.seconds
-
 suite "Waku Filter - End to End":
   var client {.threadvar.}: WakuNode
   var clientPeerId {.threadvar.}: PeerId

tests/waku_archive/archive_utils.nim

@@ -0,0 +1,56 @@
+{.used.}
+
+import
+  std/options,
+  chronos,
+  chronicles,
+  libp2p/crypto/crypto
+
+import
+  ../../../waku/[
+    node/peer_manager,
+    waku_core,
+    waku_archive,
+    waku_archive/common,
+    waku_archive/driver/sqlite_driver,
+    common/databases/db_sqlite,
+    waku_store
+  ],
+  ../testlib/[
+    common,
+    wakucore
+  ]
+
+
+proc newSqliteDatabase*(): SqliteDatabase =
+  SqliteDatabase.new(":memory:").tryGet()
+
+
+proc newSqliteArchiveDriver*(): ArchiveDriver =
+  let database = newSqliteDatabase()
+  SqliteDriver.new(database).tryGet()
+
+
+proc newWakuArchive*(driver: ArchiveDriver): WakuArchive =
+  WakuArchive.new(driver).get()
+
+
+proc computeArchiveCursor*(pubsubTopic: PubsubTopic, message: WakuMessage): ArchiveCursor =
+  ArchiveCursor(
+    pubsubTopic: pubsubTopic,
+    senderTime: message.timestamp,
+    storeTime: message.timestamp,
+    digest: waku_archive.computeDigest(message)
+  )
+
+
+proc newArchiveDriverWithMessages*(pubsubTopic: PubSubTopic, msgList: seq[WakuMessage]): ArchiveDriver = 
+  let driver = newSqliteArchiveDriver()
+
+  for msg in msgList:
+    let 
+      msgDigest = waku_archive.computeDigest(msg)
+      msgHash = computeMessageHash(pubsubTopic, msg)
+    discard waitFor driver.put(pubsubTopic, msg, msgDigest, msgHash, msg.timestamp)
+
+  return driver

tests/waku_archive/test_driver_sqlite.nim

@@ -9,23 +9,16 @@ import
   ../../../waku/waku_archive,
   ../../../waku/waku_archive/driver/sqlite_driver,
   ../../../waku/waku_core,
+  ../waku_archive/archive_utils,
   ../testlib/common,
   ../testlib/wakucore
 
 
-proc newTestDatabase(): SqliteDatabase =
-  SqliteDatabase.new(":memory:").tryGet()
-
-proc newTestSqliteDriver(): ArchiveDriver =
-  let db = newTestDatabase()
-  SqliteDriver.new(db).tryGet()
-
-
 suite "SQLite driver":
 
   test "init driver and database":
     ## Given
-    let database = newTestDatabase()
+    let database = newSqliteDatabase()
 
     ## When
     let driverRes = SqliteDriver.new(database)
@@ -45,7 +38,7 @@ suite "SQLite driver":
     ## Given
     const contentTopic = "test-content-topic"
 
-    let driver = newTestSqliteDriver()
+    let driver = newSqliteArchiveDriver()
 
     let msg = fakeWakuMessage(contentTopic=contentTopic)