akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lntest/itest: use timeout constants in rejectHTLC test

Browse Source 
The local timeout could be too short for certain backends.
This commit is contained in:
Johan T. Halseth 2019-09-02 12:05:51 +02:00
parent c3480c6066
commit d7f0372fa2
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lntest/itest/lnd_test.go
View File

@ -8853,7 +8853,6 @@ func testRejectHTLC(net *lntest.NetworkHarness, t *harnessTest) {
// //
const chanAmt = btcutil.Amount(1000000) const chanAmt = btcutil.Amount(1000000)
ctxb := context.Background() ctxb := context.Background()
timeout := time.Duration(time.Second * 5)
// Create Carol with reject htlc flag. // Create Carol with reject htlc flag.
carol, err := net.NewNode("Carol", []string{"--rejecthtlc"}) carol, err := net.NewNode("Carol", []string{"--rejecthtlc"})
@ -8885,7 +8884,7 @@ func testRejectHTLC(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Open a channel between Alice and Carol. // Open a channel between Alice and Carol.
ctxt, _ := context.WithTimeout(ctxb, timeout) ctxt, _ := context.WithTimeout(ctxb, channelOpenTimeout)
chanPointAlice := openChannelAndAssert( chanPointAlice := openChannelAndAssert(
ctxt, t, net, net.Alice, carol, ctxt, t, net, net.Alice, carol,
lntest.OpenChannelParams{ lntest.OpenChannelParams{
@ -8894,7 +8893,7 @@ func testRejectHTLC(net *lntest.NetworkHarness, t *harnessTest) {
) )
// Open a channel between Carol and Bob. // Open a channel between Carol and Bob.
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, channelOpenTimeout)
chanPointCarol := openChannelAndAssert( chanPointCarol := openChannelAndAssert(
ctxt, t, net, carol, net.Bob, ctxt, t, net, carol, net.Bob,
lntest.OpenChannelParams{ lntest.OpenChannelParams{
@ -8934,7 +8933,7 @@ func testRejectHTLC(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Alice pays Carols invoice. // Alice pays Carols invoice.
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
err = completePaymentRequests( err = completePaymentRequests(
ctxt, net.Alice, []string{resp.PaymentRequest}, true, ctxt, net.Alice, []string{resp.PaymentRequest}, true,
) )
@ -8959,7 +8958,7 @@ func testRejectHTLC(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Carol pays Bobs invoice. // Carol pays Bobs invoice.
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
err = completePaymentRequests( err = completePaymentRequests(
ctxt, carol, []string{resp.PaymentRequest}, true, ctxt, carol, []string{resp.PaymentRequest}, true,
) )
@ -8987,7 +8986,7 @@ func testRejectHTLC(net *lntest.NetworkHarness, t *harnessTest) {
// Alice attempts to pay Bobs invoice. This payment should be rejected since // Alice attempts to pay Bobs invoice. This payment should be rejected since
// we are using Carol as an intermediary hop, Carol is running lnd with // we are using Carol as an intermediary hop, Carol is running lnd with
// --rejecthtlc. // --rejecthtlc.
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
err = completePaymentRequests( err = completePaymentRequests(
ctxt, net.Alice, []string{resp.PaymentRequest}, true, ctxt, net.Alice, []string{resp.PaymentRequest}, true,
) )
@ -9001,9 +9000,9 @@ func testRejectHTLC(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Close all channels. // Close all channels.
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, channelCloseTimeout)
closeChannelAndAssert(ctxt, t, net, net.Alice, chanPointAlice, false) closeChannelAndAssert(ctxt, t, net, net.Alice, chanPointAlice, false)
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, channelCloseTimeout)
closeChannelAndAssert(ctxt, t, net, carol, chanPointCarol, false) closeChannelAndAssert(ctxt, t, net, carol, chanPointCarol, false)
} }