mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-24 06:57:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix MilliSatoshis.toSatoshis for large values (#5016)

Browse source
This commit is contained in:
benthecarman 2023-03-20 09:26:32 -05:00 • committed by GitHub
parent df5472f263
commit 5e6cb0d514
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core-test/src/test/scala/org/bitcoins/core/protocol/ln/currency/MilliSatoshisTest.scala
View file

@ -1,5 +1,6 @@
package org.bitcoins.core.protocol.ln.currency
import org.bitcoins.core.currency.Satoshis
import org.bitcoins.testkitcore.gen.ln.LnCurrencyUnitGen
import org.bitcoins.testkitcore.gen.{CurrencyUnitGenerator, NumberGenerator}
import org.bitcoins.testkitcore.util.BitcoinSUnitTest
@ -25,6 +26,18 @@ class MilliSatoshisTest extends BitcoinSUnitTest {
MilliSatoshis.fromPico(PicoBitcoins(110)) must be(MilliSatoshis(11))
}
it must "convert msat to sat correctly" in {
MilliSatoshis(0).toSatoshis must be(Satoshis.zero)
MilliSatoshis(1).toSatoshis must be(Satoshis.zero)
MilliSatoshis(999).toSatoshis must be(Satoshis.zero)
MilliSatoshis(1000).toSatoshis must be(Satoshis.one)
MilliSatoshis(1001).toSatoshis must be(Satoshis.one)
MilliSatoshis(10000).toSatoshis must be(Satoshis(10))
val max = Satoshis.max
MilliSatoshis.fromSatoshis(max).toSatoshis must be(max)
}
it must "add millisatoshis" in {
forAll(LnCurrencyUnitGen.milliSatoshisPair) { case (first, second) =>
val bigInt = first.toBigInt + second.toBigInt

2
core/src/main/scala/org/bitcoins/core/protocol/ln/currency/MilliSatoshis.scala
View file

@ -113,7 +113,7 @@ sealed abstract class MilliSatoshis
}
def toSatoshis: Satoshis = {
toLnCurrencyUnit.toSatoshis
Satoshis(underlying / 1000)
}
override def bytes: ByteVector = toUInt64.bytes.reverse