mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-13 11:35:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/v0.3.11-android-phoenix' into android-phoenix

Browse source
This commit is contained in:
dpad85 2020-09-21 10:48:22 +02:00
commit 9587a4e012
No known key found for this signature in database
GPG key ID: 574C8C6A1673E987
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala
View file

@ -218,7 +218,9 @@ final case class DATA_CLOSING(commitments: Commitments,
}
final case class DATA_WAIT_FOR_REMOTE_PUBLISH_FUTURE_COMMITMENT(commitments: Commitments, remoteChannelReestablish: ChannelReestablish) extends Data with HasCommitments
final case class DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH(data: HasCommitments, inputReconnected: INPUT_RECONNECTED) extends Data
final case class DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH(data: HasCommitments, inputReconnected: INPUT_RECONNECTED) extends Data with HasCommitments {
override def commitments: Commitments = data.commitments
}
final case class LocalParams(nodeId: PublicKey,
fundingKeyPath: DeterministicWallet.KeyPath,

2
eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
View file

@ -58,7 +58,6 @@ object Helpers {
case d: DATA_WAIT_FOR_FUNDING_CREATED => d.temporaryChannelId
case d: DATA_WAIT_FOR_FUNDING_SIGNED => d.channelId
case d: HasCommitments => d.channelId
case d: DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH => d.data.channelId
}
/**
@ -76,6 +75,7 @@ object Helpers {
case d: DATA_NEGOTIATING => d.copy(commitments = commitments1)
case d: DATA_CLOSING => d.copy(commitments = commitments1)
case d: DATA_WAIT_FOR_REMOTE_PUBLISH_FUTURE_COMMITMENT => d.copy(commitments = commitments1)
case d: DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH => d // TODO ignored
}
}