From 4253b853097d9c00da835ad7a222d91168aad9a2 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Sun, 25 Mar 2018 19:16:39 -0700 Subject: [PATCH] test: ensure tests convert from BTC to SAT properly This commit is a follow up to the prior commit which fixed a rounding error bug in lnwallet. For uniformity, we also fix other occurrences in the breach arbiter, as well as the integration tests. --- breacharbiter_test.go | 6 +++++- lnd_test.go | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/breacharbiter_test.go b/breacharbiter_test.go index 31d8002a..5ac4efa6 100644 --- a/breacharbiter_test.go +++ b/breacharbiter_test.go @@ -1255,7 +1255,11 @@ func createInitChannels(revocationWindow int) (*lnwallet.LightningChannel, *lnwa bobKeyPriv, bobKeyPub := btcec.PrivKeyFromBytes(btcec.S256(), bobsPrivKey) - channelCapacity := btcutil.Amount(10 * 1e8) + channelCapacity, err := btcutil.NewAmount(10) + if err != nil { + return nil, nil, nil, err + } + channelBal := channelCapacity / 2 aliceDustLimit := btcutil.Amount(200) bobDustLimit := btcutil.Amount(1300) diff --git a/lnd_test.go b/lnd_test.go index 27b34628..3fd20e6b 100644 --- a/lnd_test.go +++ b/lnd_test.go @@ -1418,7 +1418,7 @@ func testChannelForceClosure(net *lntest.NetworkHarness, t *harnessTest) { t.Fatalf("unable to get carol's balance: %v", err) } - carolStartingBalance := btcutil.Amount(carolBalResp.ConfirmedBalance * 1e8) + carolStartingBalance := carolBalResp.ConfirmedBalance ctxt, _ := context.WithTimeout(ctxb, timeout) chanPoint := openChannelAndAssert(ctxt, t, net, net.Alice, carol, @@ -1965,11 +1965,11 @@ func testChannelForceClosure(net *lntest.NetworkHarness, t *harnessTest) { if err != nil { t.Fatalf("unable to get carol's balance: %v", err) } - carolExpectedBalance := carolStartingBalance + pushAmt - if btcutil.Amount(carolBalResp.ConfirmedBalance*1e8) < carolExpectedBalance { + carolExpectedBalance := btcutil.Amount(carolStartingBalance) + pushAmt + if btcutil.Amount(carolBalResp.ConfirmedBalance) < carolExpectedBalance { t.Fatalf("carol's balance is incorrect: expected %v got %v", carolExpectedBalance, - btcutil.Amount(carolBalResp.ConfirmedBalance*1e8)) + carolBalResp.ConfirmedBalance) } }