Skip to content

Commit ad12f32

Browse files
committed
Fixup: fix codec backward compatibility tests
We use a custom JSON serializer for remote signature which can only be full (64 bytes) signatures.
1 parent 5ccd10b commit ad12f32

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

eclair-core/src/main/scala/fr/acinq/eclair/json/JsonSerializers.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,11 @@ object ColorSerializer extends MinimalSerializer({
332332
case c: Color => JString(c.toString)
333333
})
334334

335+
// @formatter:off
336+
private case class CommitTxAndRemoteSigJson(commitTx: CommitTx, remoteSig: ByteVector64)
337+
object CommitTxAndRemoteSigSerializer extends ConvertClassSerializer[CommitTxAndRemoteSig](i => CommitTxAndRemoteSigJson(i.commitTx, i.remoteSig.asInstanceOf[RemoteSignature.FullSignature].sig))
338+
// @formatter:on
339+
335340
// @formatter:off
336341
private sealed trait HopJson
337342
private case class ChannelHopJson(nodeId: PublicKey, nextNodeId: PublicKey, source: HopRelayParams) extends HopJson
@@ -711,6 +716,7 @@ object JsonSerializers {
711716
OpenChannelResponseSerializer +
712717
CommandResponseSerializer +
713718
InputInfoSerializer +
719+
CommitTxAndRemoteSigSerializer +
714720
ColorSerializer +
715721
ThrowableSerializer +
716722
FailureMessageSerializer +

eclair-core/src/test/scala/fr/acinq/eclair/json/JsonSerializersSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class JsonSerializersSpec extends TestKitBaseClass with AnyFunSuiteLike with Mat
204204
| "localCommit": {
205205
| "index": 0,
206206
| "spec": { "htlcs": [], "commitTxFeerate": 2500, "toLocal": 100000000, "toRemote": 50000000 },
207-
| "commitTxAndRemoteSig": { "commitTx": { "txid": "4ebd325a4b394cff8c57e8317ccf5a8d0e2bdf1b8526f8aad6c8e43d8240621a", "tx": "02000000000000000000" }, "remoteSig": { "sig": "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } },
207+
| "commitTxAndRemoteSig": { "commitTx": { "txid": "4ebd325a4b394cff8c57e8317ccf5a8d0e2bdf1b8526f8aad6c8e43d8240621a", "tx": "02000000000000000000" },"remoteSig": "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" },
208208
| "htlcTxsAndRemoteSigs": []
209209
| },
210210
| "remoteCommit": {

0 commit comments

Comments
 (0)