From 3aabbce5514e81b0faae959eb7c2d114d50645df Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 23 Nov 2017 01:12:53 -0600 Subject: [PATCH] htlcswitch: update tests to adhere to new FeeEstimator changes --- htlcswitch/link_test.go | 18 ++++++++++++------ htlcswitch/test_utils.go | 9 ++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go index 34c569178..40220efb7 100644 --- a/htlcswitch/link_test.go +++ b/htlcswitch/link_test.go @@ -1511,10 +1511,13 @@ func TestChannelLinkBandwidthConsistency(t *testing.T) { ) estimator := &lnwallet.StaticFeeEstimator{ - FeeRate: 24, - Confirmation: 6, + FeeRate: 24, } - feePerKw := btcutil.Amount(estimator.EstimateFeePerWeight(1) * 1000) + feePerWeight, err := estimator.EstimateFeePerWeight(1) + if err != nil { + t.Fatalf("unable to query fee estimator: %v", err) + } + feePerKw := feePerWeight * 1000 htlcFee := lnwire.NewMSatFromSatoshis( btcutil.Amount((int64(feePerKw) * lnwallet.HtlcWeight) / 1000), ) @@ -1643,10 +1646,13 @@ func TestChannelLinkBandwidthConsistencyOverflow(t *testing.T) { ) estimator := &lnwallet.StaticFeeEstimator{ - FeeRate: 24, - Confirmation: 6, + FeeRate: 24, } - feePerKw := btcutil.Amount(estimator.EstimateFeePerWeight(1) * 1000) + feePerWeight, err := estimator.EstimateFeePerWeight(1) + if err != nil { + t.Fatalf("unable to query fee estimator: %v", err) + } + feePerKw := feePerWeight * 1000 addLinkHTLC := func(amt lnwire.MilliSatoshi) [32]byte { invoice, htlc, err := generatePayment(amt, amt, 5, mockBlob) diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go index fb9ac7409..11f3fd758 100644 --- a/htlcswitch/test_utils.go +++ b/htlcswitch/test_utils.go @@ -172,10 +172,13 @@ func createTestChannel(alicePrivKey, bobPrivKey []byte, } estimator := &lnwallet.StaticFeeEstimator{ - FeeRate: 24, - Confirmation: 6, + FeeRate: 24, } - feePerKw := btcutil.Amount(estimator.EstimateFeePerWeight(1) * 1000) + feePerWeight, err := estimator.EstimateFeePerWeight(1) + if err != nil { + return nil, nil, nil, nil, err + } + feePerKw := btcutil.Amount(feePerWeight * 1000) commitFee := (feePerKw * btcutil.Amount(724)) / 1000 const broadcastHeight = 1