From 70d150bff601a4e272c6f848c84a9dc101c117c8 Mon Sep 17 00:00:00 2001 From: Richard Myers Date: Tue, 26 Sep 2023 10:03:08 +0200 Subject: [PATCH] Fix tests that expect network minimum feerate to be less than other rates (#2751) A minor fix for tests that rely on the minimum feerate being low. --------- Co-authored-by: Bastien Teinturier <31281497+t-bast@users.noreply.github.com> --- .../scala/fr/acinq/eclair/blockchain/fee/FeeProvider.scala | 4 ++-- .../eclair/channel/states/e/NormalSplicesStateSpec.scala | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/fee/FeeProvider.scala b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/fee/FeeProvider.scala index 149643b14..d2616c17d 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/fee/FeeProvider.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/fee/FeeProvider.scala @@ -136,8 +136,8 @@ object FeeratesPerKw { fastest = FeeratePerKw(feerates.fastest)) /** Used in tests */ - def single(feeratePerKw: FeeratePerKw): FeeratesPerKw = FeeratesPerKw( - minimum = feeratePerKw, + def single(feeratePerKw: FeeratePerKw, networkMinFee: FeeratePerKw = FeeratePerKw(FeeratePerByte(1 sat))): FeeratesPerKw = FeeratesPerKw( + minimum = networkMinFee, slow = feeratePerKw, medium = feeratePerKw, fast = feeratePerKw, diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/NormalSplicesStateSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/NormalSplicesStateSpec.scala index 7f13fe1d1..29cbb975e 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/NormalSplicesStateSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/NormalSplicesStateSpec.scala @@ -202,6 +202,7 @@ class NormalSplicesStateSpec extends TestKitBaseClass with FixtureAnyFunSuiteLik alice ! cmd // we tweak the feerate val spliceInit = alice2bob.expectMsgType[SpliceInit].copy(feerate = FeeratePerKw(100.sat)) + bob.setFeerates(alice.nodeParams.currentFeerates.copy(minimum = FeeratePerKw(101.sat))) alice2bob.forward(bob, spliceInit) val txAbortBob = bob2alice.expectMsgType[TxAbort] bob2alice.forward(alice, txAbortBob)