From 0b64ba94c002d40d06e416628cba02f24d254f9d Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Fri, 19 May 2023 18:37:03 +0800 Subject: [PATCH] itest: cleanup channels for `testSwitchOfflineDeliveryOutgoingOffline` --- itest/lnd_switch_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/itest/lnd_switch_test.go b/itest/lnd_switch_test.go index fc3a6cd5b..be1992ed4 100644 --- a/itest/lnd_switch_test.go +++ b/itest/lnd_switch_test.go @@ -264,6 +264,7 @@ func testSwitchOfflineDeliveryOutgoingOffline(ht *lntest.HarnessTest) { // three channels. Note that we won't call the cleanUp function here as // we will manually stop the node Carol and her channel. s := setupScenarioFourNodes(ht) + defer s.cleanUp() // Disconnect the two intermediaries, Alice and Dave, so that when carol // restarts, the response will be held by Dave. @@ -296,7 +297,7 @@ func testSwitchOfflineDeliveryOutgoingOffline(ht *lntest.HarnessTest) { // Shutdown carol and leave her offline for the rest of the test. This // is critical, as we wish to see if Dave can propragate settles even if // the outgoing link is never revived. - ht.Shutdown(s.carol) + restartCarol := ht.SuspendNode(s.carol) // Now restart Dave, ensuring he is both persisting the settles, and is // able to reforward them to Alice after recovering from a restart. @@ -339,8 +340,8 @@ func testSwitchOfflineDeliveryOutgoingOffline(ht *lntest.HarnessTest) { amountPaid+(baseFee*numPayments)*2, int64(0), ) - ht.CloseChannel(s.alice, s.chanPointAliceBob) - ht.CloseChannel(s.dave, s.chanPointDaveAlice) + // Finally, restart Carol so the cleanup process can be finished. + require.NoError(ht, restartCarol()) } // scenarioFourNodes specifies a scenario which we have a topology that has