chore: Simplification of store legacy code

tests/all_tests_waku.nim

@@ -25,7 +25,6 @@ import
   ./waku_archive_legacy/test_driver_queue,
   ./waku_archive_legacy/test_driver_sqlite_query,
   ./waku_archive_legacy/test_driver_sqlite,
-  ./waku_archive_legacy/test_retention_policy,
   ./waku_archive_legacy/test_waku_archive
 
 const os* {.strdefine.} = ""

tests/waku_archive_legacy/test_driver_postgres.nim

@@ -4,11 +4,13 @@ import std/[sequtils, options], testutils/unittests, chronos
 import
   waku/waku_archive_legacy,
   waku/waku_archive_legacy/driver/postgres_driver,
+  waku/waku_archive/driver/postgres_driver as new_postgres_driver,
   waku/waku_core,
   waku/waku_core/message/digest,
   ../testlib/wakucore,
   ../testlib/testasync,
-  ../testlib/postgres_legacy
+  ../testlib/postgres_legacy,
+  ../testlib/postgres as new_postgres
 
 proc computeTestCursor(pubsubTopic: PubsubTopic, message: WakuMessage): ArchiveCursor =
   ArchiveCursor(
@@ -21,22 +23,39 @@ proc computeTestCursor(pubsubTopic: PubsubTopic, message: WakuMessage): ArchiveC
 
 suite "Postgres driver":
   ## Unique driver instance
-  var driver {.threadvar.}: PostgresDriver
+  var driver {.threadvar.}: postgres_driver.PostgresDriver
+
+  ## We need to artificially create an instance of the "newDriver"
+  ## because this is the only one in charge of creating partitions
+  ## We will clean legacy store soon and this file will get removed.
+  var newDriver {.threadvar.}: new_postgres_driver.PostgresDriver
 
   asyncSetup:
-    let driverRes = await newTestPostgresDriver()
+    let driverRes = await postgres_legacy.newTestPostgresDriver()
+    if driverRes.isErr():
+      assert false, driverRes.error
+
+    driver = postgres_driver.PostgresDriver(driverRes.get())
+
+    let newDriverRes = await new_postgres.newTestPostgresDriver()
     if driverRes.isErr():
       assert false, driverRes.error
 
-    driver = PostgresDriver(driverRes.get())
+    newDriver = new_postgres_driver.PostgresDriver(newDriverRes.get())
 
   asyncTeardown:
-    let resetRes = await driver.reset()
+    var resetRes = await driver.reset()
     if resetRes.isErr():
       assert false, resetRes.error
 
     (await driver.close()).expect("driver to close")
 
+    resetRes = await newDriver.reset()
+    if resetRes.isErr():
+      assert false, resetRes.error
+
+    (await newDriver.close()).expect("driver to close")
+
   asyncTest "Asynchronous queries":
     var futures = newSeq[Future[ArchiveDriverResult[void]]](0)
 

tests/waku_archive_legacy/test_driver_postgres_query.nim

@@ -9,12 +9,15 @@ import
   waku/waku_archive_legacy,
   waku/waku_archive_legacy/driver as driver_module,
   waku/waku_archive_legacy/driver/postgres_driver,
+  waku/waku_archive/driver/postgres_driver as new_postgres_driver,
   waku/waku_core,
   waku/waku_core/message/digest,
   ../testlib/common,
   ../testlib/wakucore,
   ../testlib/testasync,
-  ../testlib/postgres_legacy
+  ../testlib/postgres_legacy,
+  ../testlib/postgres as new_postgres,
+  ../testlib/testutils
 
 logScope:
   topics = "test archive postgres driver"
@@ -36,22 +39,39 @@ proc computeTestCursor(pubsubTopic: PubsubTopic, message: WakuMessage): ArchiveC
 
 suite "Postgres driver - queries":
   ## Unique driver instance
-  var driver {.threadvar.}: PostgresDriver
+  var driver {.threadvar.}: postgres_driver.PostgresDriver
+
+  ## We need to artificially create an instance of the "newDriver"
+  ## because this is the only one in charge of creating partitions
+  ## We will clean legacy store soon and this file will get removed.
+  var newDriver {.threadvar.}: new_postgres_driver.PostgresDriver
 
   asyncSetup:
-    let driverRes = await newTestPostgresDriver()
+    let driverRes = await postgres_legacy.newTestPostgresDriver()
+    if driverRes.isErr():
+      assert false, driverRes.error
+
+    driver = postgres_driver.PostgresDriver(driverRes.get())
+
+    let newDriverRes = await new_postgres.newTestPostgresDriver()
     if driverRes.isErr():
       assert false, driverRes.error
 
-    driver = PostgresDriver(driverRes.get())
+    newDriver = new_postgres_driver.PostgresDriver(newDriverRes.get())
 
   asyncTeardown:
-    let resetRes = await driver.reset()
+    var resetRes = await driver.reset()
     if resetRes.isErr():
       assert false, resetRes.error
 
     (await driver.close()).expect("driver to close")
 
+    resetRes = await newDriver.reset()
+    if resetRes.isErr():
+      assert false, resetRes.error
+
+    (await newDriver.close()).expect("driver to close")
+
   asyncTest "no content topic":
     ## Given
     const contentTopic = "test-content-topic"
@@ -1790,7 +1810,8 @@ suite "Postgres driver - queries":
     check:
       filteredMessages.len == 0
 
-  asyncTest "Get oldest and newest message timestamp":
+  xasyncTest "Get oldest and newest message timestamp":
+    ## This test no longer makes sense because that will always be controlled by the newDriver
     const contentTopic = "test-content-topic"
 
     let timeOrigin = now()
@@ -1842,7 +1863,8 @@ suite "Postgres driver - queries":
     assert res.isOk(), res.error
     assert res.get() == newestTime, "Failed to retrieve the newest timestamp"
 
-  asyncTest "Delete messages older than certain timestamp":
+  xasyncTest "Delete messages older than certain timestamp":
+    ## This test no longer makes sense because that will always be controlled by the newDriver
     const contentTopic = "test-content-topic"
 
     let timeOrigin = now()
@@ -1884,7 +1906,8 @@ suite "Postgres driver - queries":
     assert res.isOk(), res.error
     assert res.get() == 3, "Failed to retrieve the # of messages after deletion"
 
-  asyncTest "Keep last n messages":
+  xasyncTest "Keep last n messages":
+    ## This test no longer makes sense because that will always be controlled by the newDriver
     const contentTopic = "test-content-topic"
 
     let timeOrigin = now()

waku/factory/node_factory.nim

@@ -21,8 +21,6 @@ import
   ../waku_archive/retention_policy/builder as policy_builder,
   ../waku_archive/driver as driver,
   ../waku_archive/driver/builder as driver_builder,
-  ../waku_archive_legacy/retention_policy as legacy_policy,
-  ../waku_archive_legacy/retention_policy/builder as legacy_policy_builder,
   ../waku_archive_legacy/driver as legacy_driver,
   ../waku_archive_legacy/driver/builder as legacy_driver_builder,
   ../waku_store,
@@ -232,13 +230,7 @@ proc setupProtocols(
       if archiveDriverRes.isErr():
         return err("failed to setup legacy archive driver: " & archiveDriverRes.error)
 
-      let retPolicyRes =
-        legacy_policy.RetentionPolicy.new(conf.storeMessageRetentionPolicy)
-      if retPolicyRes.isErr():
-        return err("failed to create retention policy: " & retPolicyRes.error)
-
-      let mountArcRes =
-        node.mountLegacyArchive(archiveDriverRes.get(), retPolicyRes.get())
+      let mountArcRes = node.mountLegacyArchive(archiveDriverRes.get())
       if mountArcRes.isErr():
         return err("failed to mount waku legacy archive protocol: " & mountArcRes.error)
 

waku/node/waku_node.nim

@@ -701,17 +701,11 @@ proc mountArchive*(
   return ok()
 
 proc mountLegacyArchive*(
-    node: WakuNode,
-    driver: waku_archive_legacy.ArchiveDriver,
-    retentionPolicy = none(waku_archive_legacy.RetentionPolicy),
+    node: WakuNode, driver: waku_archive_legacy.ArchiveDriver
 ): Result[void, string] =
-  node.wakuLegacyArchive = waku_archive_legacy.WakuArchive.new(
-    driver = driver, retentionPolicy = retentionPolicy
-  ).valueOr:
+  node.wakuLegacyArchive = waku_archive_legacy.WakuArchive.new(driver = driver).valueOr:
     return err("error in mountLegacyArchive: " & error)
 
-  node.wakuLegacyArchive.start()
-
   return ok()
 
 ## Legacy Waku Store

waku/waku_archive_legacy.nim

@@ -1,7 +1,6 @@
 import
   ./waku_archive_legacy/common,
   ./waku_archive_legacy/archive,
-  ./waku_archive_legacy/driver,
-  ./waku_archive_legacy/retention_policy
+  ./waku_archive_legacy/driver
 
-export common, archive, driver, retention_policy
+export common, archive, driver