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

small scaladoc fixes

Browse source
This commit is contained in:
pm47 2017-01-27 18:17:59 +01:00
parent 2d45f6aea6
commit 37b00f708c
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eclair-node/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
View file

@ -223,10 +223,10 @@ object Helpers {
* When an unexpected transaction spending the funding tx is detected:
* 1) we find out if the published transaction is one of remote's revoked txs
* 2) and then:
* a) if it is a revoked tx we build a set of transactions that will punish them by stealing all their funds
* b) otherwise there is nothing we can do
* a) if it is a revoked tx we build a set of transactions that will punish them by stealing all their funds
* b) otherwise there is nothing we can do
*
* @return a list of transactions (one per HTLC that we can claim) if the tx is a revoked commitment, [[None]] otherwise
* @return a [[RevokedCommitPublished]] object containing punishment transactions if the tx is a revoked commitment
*/
def claimRevokedRemoteCommitTxOutputs(commitments: Commitments, tx: Transaction): Option[RevokedCommitPublished] = {
import commitments._

1
eclair-node/src/main/scala/fr/acinq/eclair/crypto/ChaCha20Poly1305.scala
View file

@ -101,7 +101,6 @@ object ChaCha20Poly1305 extends Logging {
* @param aad additional authentication data. can be empty
* @param mac authentication mac
* @return the decrypted plaintext if the mac is valid.
* @throws AssertionError error if the mac is invalid
*/
def decrypt(key: BinaryData, nonce: BinaryData, ciphertext: BinaryData, aad: BinaryData, mac: BinaryData): BinaryData = {
val polykey: BinaryData = ChaCha20.encrypt(new Array[Byte](32), key, nonce)