From 222385bf73fa3244239736ce97d23a82cac2aeea Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 16 May 2017 18:56:39 -0700 Subject: [PATCH] lnwallet: calcStaticFee now directly uses feePerKw --- lnwallet/channel_test.go | 4 ++-- lnwallet/interface_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go index fa4dc075..7933f49d 100644 --- a/lnwallet/channel_test.go +++ b/lnwallet/channel_test.go @@ -337,9 +337,9 @@ func calcStaticFee(numHTLCs int) btcutil.Amount { const ( commitWeight = btcutil.Amount(724) htlcWeight = 172 - feePerByte = btcutil.Amount(50 * 4) + feePerKw = btcutil.Amount(24/4) * 1000 ) - return feePerByte * (commitWeight + + return feePerKw * (commitWeight + btcutil.Amount(htlcWeight*numHTLCs)) / 1000 } diff --git a/lnwallet/interface_test.go b/lnwallet/interface_test.go index b4ac89fd..3998e0d4 100644 --- a/lnwallet/interface_test.go +++ b/lnwallet/interface_test.go @@ -109,9 +109,9 @@ func calcStaticFee(numHTLCs int) btcutil.Amount { const ( commitWeight = btcutil.Amount(724) htlcWeight = 172 - feePerByte = btcutil.Amount(250 * 4) + feePerKw = btcutil.Amount(250/4) * 1000 ) - return feePerByte * (commitWeight + + return feePerKw * (commitWeight + btcutil.Amount(htlcWeight*numHTLCs)) / 1000 }