mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-27 02:37:06 +01:00
Code Issues Projects Releases Wiki Activity

added weHaveChanges/theyHaveChanges functions

Browse source
This commit is contained in:
pm47 2016-08-19 17:24:23 +02:00
parent f1ec782e27
commit 9d19d35613
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eclair-demo/src/main/scala/fr/acinq/eclair/channel/Commitments.scala
View file

@ -143,10 +143,14 @@ object Commitments {
}
}
def weHaveChanges(commitments: Commitments): Boolean = commitments.theirChanges.acked.size > 0 || commitments.ourChanges.proposed.size > 0
def theyHaveChanges(commitments: Commitments): Boolean = commitments.ourChanges.acked.size > 0 || commitments.theirChanges.proposed.size > 0
def sendCommit(commitments: Commitments): (Commitments, update_commit) = {
import commitments._
commitments.theirNextCommitInfo match {
case Right(theirNextRevocationHash) if theirChanges.acked.isEmpty && ourChanges.proposed.isEmpty =>
case Right(theirNextRevocationHash) if !weHaveChanges(commitments) =>
throw new RuntimeException("cannot sign when there are no changes")
case Right(theirNextRevocationHash) =>
// sign all our proposals + their acked proposals
@ -177,7 +181,7 @@ object Commitments {
// we will reply to this sig with our old revocation hash preimage (at index) and our next revocation hash (at index + 1)
// and will increment our index
if (ourChanges.acked.isEmpty && commitments.theirChanges.proposed.isEmpty)
if (!theyHaveChanges(commitments))
throw new RuntimeException("cannot sign when there are no changes")
// check that their signature is valid