lntest+itest: adjust tests to work with the RBF coop close changes

Author: MPins

itest/lnd_coop_close_rbf_test.go

@@ -42,7 +42,7 @@ func testCoopCloseRbf(ht *lntest.HarnessTest) {
 	alicePendingUpdate := aliceCloseUpdate.GetClosePending()
 	require.NotNil(ht, aliceCloseUpdate)
 	require.Equal(
-		ht, int64(aliceFeeRate), alicePendingUpdate.FeePerVbyte,
+		ht, int64(aliceFeeRate), int64(alicePendingUpdate.FeePerKw/250),
 	)
 	require.True(ht, alicePendingUpdate.LocalCloseTx)
 
@@ -57,7 +57,9 @@ func testCoopCloseRbf(ht *lntest.HarnessTest) {
 	// Confirm that this new update was at 10 sat/vb.
 	bobPendingUpdate := bobCloseUpdate.GetClosePending()
 	require.NotNil(ht, bobCloseUpdate)
-	require.Equal(ht, bobPendingUpdate.FeePerVbyte, int64(bobFeeRate))
+	require.Equal(
+		ht, int64(bobPendingUpdate.FeePerKw/250), int64(bobFeeRate),
+	)
 	require.True(ht, bobPendingUpdate.LocalCloseTx)
 
 	var err error
@@ -68,7 +70,9 @@ func testCoopCloseRbf(ht *lntest.HarnessTest) {
 	require.NoError(ht, err)
 	alicePendingUpdate = aliceCloseUpdate.GetClosePending()
 	require.NotNil(ht, aliceCloseUpdate)
-	require.Equal(ht, alicePendingUpdate.FeePerVbyte, int64(bobFeeRate))
+	require.Equal(
+		ht, int64(alicePendingUpdate.FeePerKw/250), int64(bobFeeRate),
+	)
 	require.False(ht, alicePendingUpdate.LocalCloseTx)
 
 	// We'll now attempt to make a fee update that increases Alice's fee
@@ -84,7 +88,7 @@ func testCoopCloseRbf(ht *lntest.HarnessTest) {
 	alicePendingUpdate = aliceCloseUpdate.GetClosePending()
 	require.NotNil(ht, aliceCloseUpdate)
 	require.Equal(
-		ht, alicePendingUpdate.FeePerVbyte,
+		ht, int64(alicePendingUpdate.FeePerKw/250),
 		int64(aliceRejectedFeeRate),
 	)
 	require.True(ht, alicePendingUpdate.LocalCloseTx)
@@ -118,7 +122,7 @@ func testCoopCloseRbf(ht *lntest.HarnessTest) {
 	alicePendingUpdate = aliceCloseUpdate.GetClosePending()
 	require.NotNil(ht, aliceCloseUpdate)
 	require.Equal(
-		ht, alicePendingUpdate.FeePerVbyte, int64(aliceFeeRate),
+		ht, int64(alicePendingUpdate.FeePerKw/250), int64(aliceFeeRate),
 	)
 	require.True(ht, alicePendingUpdate.LocalCloseTx)
 

lntest/harness.go

@@ -1343,9 +1343,14 @@ func (h *HarnessTest) CloseChannelAssertPending(hn *node.HarnessNode,
 			continue
 		}
 
-		notifyRate := pendingClose.ClosePending.FeePerVbyte
+		// Close pending nottification in FeePerKw overwrites
+		// FeePerVbyte.
+		notifyRate := uint64(pendingClose.ClosePending.FeePerVbyte)
+		if pendingClose.ClosePending.FeePerKw != 0 {
+			notifyRate = pendingClose.ClosePending.FeePerKw / 250
+		}
 		if closeOpts.localTxOnly &&
-			notifyRate != int64(closeReq.SatPerVbyte) {
+			notifyRate != closeReq.SatPerVbyte {
 
 			continue
 		}