Fix SqlitePeersDb storage removal

The confusion between SQL timestamps and long resulted in always
removing storage regardless of the `peerRemovedBefore` parameter.

Author: t-bast

eclair-core/src/main/scala/fr/acinq/eclair/db/sqlite/SqlitePeersDb.scala

@@ -47,15 +47,15 @@ class SqlitePeersDb(val sqlite: Connection) extends PeersDb with Logging {
     }
 
     def migration23(statement: Statement): Unit = {
-      statement.executeUpdate("CREATE TABLE peer_storage (node_id BLOB NOT NULL PRIMARY KEY, data NOT NULL, last_updated_at INTEGER NOT NULL, removed_peer_at INTEGER)")
+      statement.executeUpdate("CREATE TABLE peer_storage (node_id BLOB NOT NULL PRIMARY KEY, data BLOB NOT NULL, last_updated_at INTEGER NOT NULL, removed_peer_at INTEGER)")
       statement.executeUpdate("CREATE INDEX removed_peer_at_idx ON peer_storage(removed_peer_at)")
     }
 
     getVersion(statement, DB_NAME) match {
       case None =>
         statement.executeUpdate("CREATE TABLE peers (node_id BLOB NOT NULL PRIMARY KEY, data BLOB NOT NULL)")
         statement.executeUpdate("CREATE TABLE relay_fees (node_id BLOB NOT NULL PRIMARY KEY, fee_base_msat INTEGER NOT NULL, fee_proportional_millionths INTEGER NOT NULL)")
-        statement.executeUpdate("CREATE TABLE peer_storage (node_id BLOB NOT NULL PRIMARY KEY, data NOT NULL, last_updated_at INTEGER NOT NULL, removed_peer_at INTEGER)")
+        statement.executeUpdate("CREATE TABLE peer_storage (node_id BLOB NOT NULL PRIMARY KEY, data BLOB NOT NULL, last_updated_at INTEGER NOT NULL, removed_peer_at INTEGER)")
 
         statement.executeUpdate("CREATE INDEX removed_peer_at_idx ON peer_storage(removed_peer_at)")
       case Some(v@(1 | 2)) =>
@@ -101,7 +101,7 @@ class SqlitePeersDb(val sqlite: Connection) extends PeersDb with Logging {
 
   override def removePeerStorage(peerRemovedBefore: TimestampSecond): Unit = withMetrics("peers/remove-storage", DbBackends.Sqlite) {
       using(sqlite.prepareStatement("DELETE FROM peer_storage WHERE removed_peer_at < ?")) { statement =>
-        statement.setTimestamp(1, peerRemovedBefore.toSqlTimestamp)
+        statement.setLong(1, peerRemovedBefore.toLong)
         statement.executeUpdate()
       }
   }

eclair-core/src/test/scala/fr/acinq/eclair/db/PeersDbSpec.scala

@@ -18,10 +18,10 @@ package fr.acinq.eclair.db
 
 import fr.acinq.bitcoin.scalacompat.Crypto.PublicKey
 import fr.acinq.eclair.TestDatabases.{TestPgDatabases, TestSqliteDatabases}
+import fr.acinq.eclair._
 import fr.acinq.eclair.db.pg.PgPeersDb
 import fr.acinq.eclair.db.sqlite.SqlitePeersDb
 import fr.acinq.eclair.payment.relay.Relayer.RelayFees
-import fr.acinq.eclair._
 import fr.acinq.eclair.wire.protocol.{NodeAddress, Tor2, Tor3}
 import org.scalatest.funsuite.AnyFunSuite
 import scodec.bits.HexStringSyntax
@@ -108,7 +108,7 @@ class PeersDbSpec extends AnyFunSuite {
     }
   }
 
-  test("peer storage") {
+  test("add/update/remove peer storage") {
     forAllDbs { dbs =>
       val db = dbs.peers
 
@@ -126,6 +126,21 @@ class PeersDbSpec extends AnyFunSuite {
       db.updateStorage(b, hex"abcd")
       assert(db.getStorage(a) == Some(hex"6789"))
       assert(db.getStorage(b) == Some(hex"abcd"))
+
+      // Actively used storage shouldn't be removed.
+      db.removePeerStorage(TimestampSecond.now() + 1.hour)
+      assert(db.getStorage(a) == Some(hex"6789"))
+      assert(db.getStorage(b) == Some(hex"abcd"))
+
+      // After removing the peer, peer storage can be removed.
+      db.removePeer(a)
+      assert(db.getStorage(a) == Some(hex"6789"))
+      db.removePeerStorage(TimestampSecond.now() - 1.hour)
+      assert(db.getStorage(a) == Some(hex"6789"))
+      db.removePeerStorage(TimestampSecond.now() + 1.hour)
+      assert(db.getStorage(a) == None)
+      assert(db.getStorage(b) == Some(hex"abcd"))
     }
   }
+
 }