lntest: fix linter errors for changed code

This commit is contained in:
Oliver Gugger 2020-12-08 16:46:54 +01:00
parent 809d238364
commit a436618e43
No known key found for this signature in database
GPG Key ID: 8E4256593F177720

@ -290,7 +290,6 @@ func (n *NetworkHarness) NewNodeWithSeed(name string, extraArgs []string,
return nil, nil, nil, err return nil, nil, nil, err
} }
timeout := time.Duration(DefaultTimeout)
ctxb := context.Background() ctxb := context.Background()
// Create a request to generate a new aezeed. The new seed will have the // Create a request to generate a new aezeed. The new seed will have the
@ -299,7 +298,8 @@ func (n *NetworkHarness) NewNodeWithSeed(name string, extraArgs []string,
AezeedPassphrase: password, AezeedPassphrase: password,
} }
ctxt, _ := context.WithTimeout(ctxb, timeout) ctxt, cancel := context.WithTimeout(ctxb, DefaultTimeout)
defer cancel()
genSeedResp, err := node.GenSeed(ctxt, genSeedReq) genSeedResp, err := node.GenSeed(ctxt, genSeedReq)
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
@ -457,7 +457,8 @@ func (n *NetworkHarness) EnsureConnected(ctx context.Context, a, b *HarnessNode)
errConnectionRequested := errors.New("connection request in progress") errConnectionRequested := errors.New("connection request in progress")
tryConnect := func(a, b *HarnessNode) error { tryConnect := func(a, b *HarnessNode) error {
ctxt, _ := context.WithTimeout(ctx, DefaultTimeout) ctxt, cancel := context.WithTimeout(ctx, DefaultTimeout)
defer cancel()
bInfo, err := b.GetInfo(ctxt, &lnrpc.GetInfoRequest{}) bInfo, err := b.GetInfo(ctxt, &lnrpc.GetInfoRequest{})
if err != nil { if err != nil {
return err return err
@ -530,7 +531,8 @@ func (n *NetworkHarness) EnsureConnected(ctx context.Context, a, b *HarnessNode)
// If node B is seen in the ListPeers response from node A, // If node B is seen in the ListPeers response from node A,
// then we can exit early as the connection has been fully // then we can exit early as the connection has been fully
// established. // established.
ctxt, _ := context.WithTimeout(ctx, DefaultTimeout) ctxt, cancel := context.WithTimeout(ctx, DefaultTimeout)
defer cancel()
resp, err := b.ListPeers(ctxt, &lnrpc.ListPeersRequest{}) resp, err := b.ListPeers(ctxt, &lnrpc.ListPeersRequest{})
if err != nil { if err != nil {
return false return false