itest: fix existing itests

itest/lnd_channel_force_close_test.go

@@ -451,7 +451,8 @@ func channelForceClosureTest(ht *lntest.HarnessTest,
 
 	// Allow some deviation because weight estimates during tx generation
 	// are estimates.
-	require.InEpsilon(ht, expectedFeeRate, feeRate, 0.005)
+	require.InEpsilonf(ht, expectedFeeRate, feeRate, 0.005, "fee rate not "+
+		"match: want %v, got %v", expectedFeeRate, feeRate)
 
 	// Find alice's commit sweep and anchor sweep (if present) in the
 	// mempool.

lntest/fee_service.go

@@ -32,6 +32,9 @@ type WebFeeService interface {
 	// SetFeeRate sets the estimated fee rate for a given confirmation
 	// target.
 	SetFeeRate(feeRate chainfee.SatPerKWeight, conf uint32)
+
+	// Reset resets the fee rate map to the default value.
+	Reset()
 }
 
 const (
@@ -140,6 +143,16 @@ func (f *FeeService) SetFeeRate(fee chainfee.SatPerKWeight, conf uint32) {
 	f.feeRateMap[conf] = uint32(fee.FeePerKVByte())
 }
 
+// Reset resets the fee rate map to the default value.
+func (f *FeeService) Reset() {
+	f.lock.Lock()
+	f.feeRateMap = make(map[uint32]uint32)
+	f.lock.Unlock()
+
+	// Initialize default fee estimate.
+	f.SetFeeRate(DefaultFeeRateSatPerKw, 1)
+}
+
 // URL returns the service endpoint.
 func (f *FeeService) URL() string {
 	return f.url

lntest/harness.go

@@ -396,7 +396,7 @@ func (h *HarnessTest) Subtest(t *testing.T) *HarnessTest {
 	st.resetStandbyNodes(t)
 
 	// Reset fee estimator.
-	st.SetFeeEstimate(DefaultFeeRateSatPerKw)
+	st.feeService.Reset()
 
 	// Record block height.
 	_, startHeight := h.Miner.GetBestBlock()