itest: fix flake in testPaymentFailureReasonCanceled
Fix the case,
```
--- FAIL: TestLightningNetworkDaemon/tranche01/46-of-191/bitcoind/payment_failure_reason_canceled (20.86s)
harness.go:2113:
Error Trace: /home/runner/work/lnd/lnd/lntest/harness.go:2113
/home/runner/work/lnd/lnd/itest/lnd_payment_test.go:1183
/home/runner/work/lnd/lnd/itest/lnd_payment_test.go:1138
/home/runner/work/lnd/lnd/lntest/harness.go:396
/home/runner/work/lnd/lnd/itest/lnd_test.go:139
Error: err from HTLC interceptor stream
Test: TestLightningNetworkDaemon/tranche01/46-of-191/bitcoind/payment_failure_reason_canceled
Messages: received err from HTLC interceptor stream: rpc error: code = Unknown desc = interceptor already exists
```
This commit is contained in:
1 file changed
+8
-9
@@ -1113,12 +1113,16 @@ func testPaymentFailureReasonCanceled(ht *lntest.HarnessTest) {
|
|||||||
// Make sure Alice is aware of channel Bob=>Carol.
|
// Make sure Alice is aware of channel Bob=>Carol.
|
||||||
ht.AssertTopologyChannelOpen(alice, cpBC)
|
ht.AssertTopologyChannelOpen(alice, cpBC)
|
||||||
|
|
||||||
|
// Connect the interceptor.
|
||||||
|
interceptor, cancelInterceptor := bob.RPC.HtlcInterceptor()
|
||||||
|
defer cancelInterceptor()
|
||||||
|
|
||||||
// First we check that the payment is successful when bob resumes the
|
// First we check that the payment is successful when bob resumes the
|
||||||
// htlc even though the payment context was canceled before invoice
|
// htlc even though the payment context was canceled before invoice
|
||||||
// settlement.
|
// settlement.
|
||||||
sendPaymentInterceptAndCancel(
|
sendPaymentInterceptAndCancel(
|
||||||
ht, ts, cpAB, routerrpc.ResolveHoldForwardAction_RESUME,
|
ht, ts, cpAB, routerrpc.ResolveHoldForwardAction_RESUME,
|
||||||
lnrpc.Payment_SUCCEEDED,
|
lnrpc.Payment_SUCCEEDED, interceptor,
|
||||||
)
|
)
|
||||||
|
|
||||||
// Next we check that the context cancellation results in the expected
|
// Next we check that the context cancellation results in the expected
|
||||||
@@ -1128,7 +1132,7 @@ func testPaymentFailureReasonCanceled(ht *lntest.HarnessTest) {
|
|||||||
// htlc fail case before the htlc resume case.
|
// htlc fail case before the htlc resume case.
|
||||||
sendPaymentInterceptAndCancel(
|
sendPaymentInterceptAndCancel(
|
||||||
ht, ts, cpAB, routerrpc.ResolveHoldForwardAction_FAIL,
|
ht, ts, cpAB, routerrpc.ResolveHoldForwardAction_FAIL,
|
||||||
lnrpc.Payment_FAILED,
|
lnrpc.Payment_FAILED, interceptor,
|
||||||
)
|
)
|
||||||
|
|
||||||
// Finally, close channels.
|
// Finally, close channels.
|
||||||
@@ -1139,14 +1143,12 @@ func testPaymentFailureReasonCanceled(ht *lntest.HarnessTest) {
|
|||||||
func sendPaymentInterceptAndCancel(ht *lntest.HarnessTest,
|
func sendPaymentInterceptAndCancel(ht *lntest.HarnessTest,
|
||||||
ts *interceptorTestScenario, cpAB *lnrpc.ChannelPoint,
|
ts *interceptorTestScenario, cpAB *lnrpc.ChannelPoint,
|
||||||
interceptorAction routerrpc.ResolveHoldForwardAction,
|
interceptorAction routerrpc.ResolveHoldForwardAction,
|
||||||
expectedPaymentStatus lnrpc.Payment_PaymentStatus) {
|
expectedPaymentStatus lnrpc.Payment_PaymentStatus,
|
||||||
|
interceptor rpc.InterceptorClient) {
|
||||||
|
|
||||||
// Prepare the test cases.
|
// Prepare the test cases.
|
||||||
alice, bob, carol := ts.alice, ts.bob, ts.carol
|
alice, bob, carol := ts.alice, ts.bob, ts.carol
|
||||||
|
|
||||||
// Connect the interceptor.
|
|
||||||
interceptor, cancelInterceptor := bob.RPC.HtlcInterceptor()
|
|
||||||
|
|
||||||
// Prepare the test cases.
|
// Prepare the test cases.
|
||||||
addResponse := carol.RPC.AddInvoice(&lnrpc.Invoice{
|
addResponse := carol.RPC.AddInvoice(&lnrpc.Invoice{
|
||||||
ValueMsat: 1000,
|
ValueMsat: 1000,
|
||||||
@@ -1208,9 +1210,6 @@ func sendPaymentInterceptAndCancel(ht *lntest.HarnessTest,
|
|||||||
// should've been made, and we observe FAILURE_REASON_CANCELED.
|
// should've been made, and we observe FAILURE_REASON_CANCELED.
|
||||||
expectedReason := lnrpc.PaymentFailureReason_FAILURE_REASON_CANCELED
|
expectedReason := lnrpc.PaymentFailureReason_FAILURE_REASON_CANCELED
|
||||||
ht.AssertPaymentFailureReason(alice, preimage, expectedReason)
|
ht.AssertPaymentFailureReason(alice, preimage, expectedReason)
|
||||||
|
|
||||||
// Cancel the context, which will disconnect the above interceptor.
|
|
||||||
cancelInterceptor()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// testSendToRouteFailHTLCTimeout is similar to
|
// testSendToRouteFailHTLCTimeout is similar to
|
||||||
|
|||||||
Reference in new issue
Block a user