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

minor fixes

Browse source
This commit is contained in:
sstone 2017-01-23 15:53:35 +01:00
parent b83cf24e09
commit 08f1c893ff
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eclair-node/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View file

@ -129,7 +129,7 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
fundingSatoshis = open.fundingSatoshis,
minimumDepth = minimumDepth,
autoSignInterval = autoSignInterval)
goto(WAIT_FOR_FUNDING_CREATED) using DATA_WAIT_FOR_FUNDING_CREATED(open.temporaryChannelId, params, open.pushMsat, Point(open.firstPerCommitmentPoint))
goto(WAIT_FOR_FUNDING_CREATED) using DATA_WAIT_FOR_FUNDING_CREATED(open.temporaryChannelId, params, open.pushMsat, open.firstPerCommitmentPoint)
case Event(CMD_CLOSE(_), _) => goto(CLOSED)

6
eclair-node/src/test/scala/fr/acinq/eclair/transactions/TransactionsSpec.scala
View file

@ -1,10 +1,10 @@
package fr.acinq.eclair.transactions
import java.nio.{ByteBuffer, ByteOrder}
import java.nio.ByteOrder
import fr.acinq.bitcoin.Crypto.{PrivateKey, sha256}
import fr.acinq.bitcoin.Script.{pay2wpkh, pay2wsh, write}
import fr.acinq.bitcoin.{BinaryData, Btc, Crypto, MilliBtc, MilliSatoshi, Satoshi, Script, Transaction, TxOut, millibtc2satoshi}
import fr.acinq.bitcoin.{BinaryData, Btc, Crypto, MilliBtc, MilliSatoshi, Protocol, Satoshi, Script, Transaction, TxOut, millibtc2satoshi}
import fr.acinq.eclair.channel.Helpers.Funding
import fr.acinq.eclair.transactions.Scripts.toLocalDelayed
import fr.acinq.eclair.transactions.Transactions.{addSigs, _}
@ -122,7 +122,7 @@ class TransactionsSpec extends FunSuite {
{
assert(getCommitTxNumber(commitTx.tx, localPaymentPriv.publicKey, remotePaymentPriv.publicKey) == commitTxNumber)
val hash: Array[Byte] = Crypto.sha256(localPaymentPriv.publicKey.toBin ++ remotePaymentPriv.publicKey.toBin)
val num = ByteBuffer.wrap(hash.takeRight(8)).order(ByteOrder.BIG_ENDIAN).getLong & 0xffffffffffffL
val num = Protocol.uint64(hash.takeRight(8), ByteOrder.BIG_ENDIAN) & 0xffffffffffffL
val check = ((commitTx.tx.txIn(0).sequence & 0xffffff) << 24) | (commitTx.tx.lockTime)
assert((check ^ num) == commitTxNumber)
}