introduce a common set of internal codecs

ACINQ · Mar 18, 2021 · 41bf1fa · 41bf1fa
1 parent e20ae86
commit 41bf1fa
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/...ir-core/src/main/scala/fr/acinq/eclair/blockchain/electrum/db/sqlite/SqliteWalletDb.scala b/...ir-core/src/main/scala/fr/acinq/eclair/blockchain/electrum/db/sqlite/SqliteWalletDb.scala
@@ -22,6 +22,7 @@ import fr.acinq.eclair.blockchain.electrum.ElectrumWallet.PersistentData
 import fr.acinq.eclair.blockchain.electrum.db.WalletDb
 import fr.acinq.eclair.blockchain.electrum.{ElectrumClient, ElectrumWallet}
 import fr.acinq.eclair.db.sqlite.SqliteUtils
+import fr.acinq.eclair.wire.internal.InternalCommonCodecs.txCodec
 
 import java.sql.Connection
 import scala.collection.immutable.Queue
@@ -164,10 +165,6 @@ object SqliteWalletDb {
     (wire: BitVector) => heightsListCodec.decode(wire).map(_.map(_.toMap))
   )
 
-  def lengthDelimited[T](codec: Codec[T]): Codec[T] = variableSizeBytesLong(varintoverflow, codec)
-
-  val txCodec: Codec[Transaction] = lengthDelimited(bytes.xmap(d => Transaction.read(d.toArray), d => Transaction.write(d)))
-
   val transactionListCodec: Codec[List[(ByteVector32, Transaction)]] = listOfN(uint16, bytes32 ~ txCodec)
 
   val transactionsCodec: Codec[Map[ByteVector32, Transaction]] = Codec[Map[ByteVector32, Transaction]](

diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/wire/internal/InternalCommonCodecs.scala b/eclair-core/src/main/scala/fr/acinq/eclair/wire/internal/InternalCommonCodecs.scala
@@ -0,0 +1,17 @@
+package fr.acinq.eclair.wire.internal
+
+import fr.acinq.bitcoin.Transaction
+import fr.acinq.eclair.wire.CommonCodecs.varintoverflow
+import scodec.Codec
+import scodec.codecs.{bytes, variableSizeBytesLong}
+
+object InternalCommonCodecs {
+
+  /**
+   * All LN protocol message must be stored as length-delimited, because they may have arbitrary trailing data
+   */
+  def lengthDelimited[T](codec: Codec[T]): Codec[T] = variableSizeBytesLong(varintoverflow, codec)
+
+  val txCodec: Codec[Transaction] = lengthDelimited(bytes.xmap(d => Transaction.read(d.toArray), d => Transaction.write(d)))
+
+}
diff --git a/...r-core/src/main/scala/fr/acinq/eclair/wire/internal/channel/version2/ChannelCodecs2.scala b/...r-core/src/main/scala/fr/acinq/eclair/wire/internal/channel/version2/ChannelCodecs2.scala
@@ -26,8 +26,7 @@ import fr.acinq.eclair.transactions._
 import fr.acinq.eclair.wire.CommonCodecs._
 import fr.acinq.eclair.wire.LightningMessageCodecs._
 import fr.acinq.eclair.wire.UpdateMessage
-import fr.acinq.eclair.wire.internal.channel.version0.ChannelCodecs0
-import fr.acinq.eclair.wire.internal.channel.version1.ChannelCodecs1
+import fr.acinq.eclair.wire.internal.InternalCommonCodecs._
 import grizzled.slf4j.Logging
 import scodec.codecs._
 import scodec.{Attempt, Codec}
@@ -39,11 +38,6 @@ private[channel] object ChannelCodecs2 extends Logging {
 
   private[version2] object Codecs {
 
-    /**
-     * All LN protocol message must be stored as length-delimited, because they may have arbitrary trailing data
-     */
-    def lengthDelimited[T](codec: Codec[T]): Codec[T] = variableSizeBytesLong(varintoverflow, codec)
-
     val keyPathCodec: Codec[KeyPath] = ("path" | listOfN(uint16, uint32)).xmap[KeyPath](l => new KeyPath(l), keyPath => keyPath.path.toList).as[KeyPath]
 
     val extendedPrivateKeyCodec: Codec[ExtendedPrivateKey] = (
@@ -103,8 +97,6 @@ private[channel] object ChannelCodecs2 extends Logging {
 
     val txOutCodec: Codec[TxOut] = lengthDelimited(bytes.xmap(d => TxOut.read(d.toArray), d => TxOut.write(d)))
 
-    val txCodec: Codec[Transaction] = lengthDelimited(bytes.xmap(d => Transaction.read(d.toArray), d => Transaction.write(d)))
-
     val outputInfoCodec: Codec[OutputInfo] = (
       ("index" | uint32) ::
         ("amount" | satoshi) ::

diff --git a/...ore/src/test/scala/fr/acinq/eclair/blockchain/electrum/db/sqlite/SqliteWalletDbSpec.scala b/...ore/src/test/scala/fr/acinq/eclair/blockchain/electrum/db/sqlite/SqliteWalletDbSpec.scala
@@ -20,8 +20,9 @@ import fr.acinq.bitcoin.{Block, BlockHeader, OutPoint, Satoshi, Transaction, TxI
 import fr.acinq.eclair.blockchain.electrum.ElectrumClient
 import fr.acinq.eclair.blockchain.electrum.ElectrumClient.GetMerkleResponse
 import fr.acinq.eclair.blockchain.electrum.ElectrumWallet.PersistentData
-import fr.acinq.eclair.{TestConstants, randomBytes, randomBytes32}
 import fr.acinq.eclair.wire.CommonCodecs.setCodec
+import fr.acinq.eclair.wire.internal.InternalCommonCodecs.txCodec
+import fr.acinq.eclair.{TestConstants, randomBytes, randomBytes32}
 import org.scalatest.funsuite.AnyFunSuite
 import scodec.Codec
 import scodec.bits.BitVector
@@ -104,7 +105,6 @@ class SqliteWalletDbSpec extends AnyFunSuite {
 
   test("read old persistent data") {
     import SqliteWalletDb._
-    import fr.acinq.eclair.wire.internal.channel.ChannelCodecs._
     import scodec.codecs._
 
     val oldPersistentDataCodec: Codec[PersistentData] = (