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

lntest: more descriptive errors for CloseChannel

Browse Source 
This improves the error reporting for the harness' CloseChannel so that
the exact step where closure fails can be better indicated.

This is to help debug some flaky failures in the CI.
This commit is contained in:
Matheus Degiovani 2020-03-09 11:10:14 -03:00
parent 60446494e9
commit 19873f721f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lntest/harness.go
View File

@ -1128,7 +1128,8 @@ func (n *NetworkHarness) CloseChannel(ctx context.Context,
// within the network. // within the network.
closeResp, err := closeRespStream.Recv() closeResp, err := closeRespStream.Recv()
if err != nil { if err != nil {
errChan <- err errChan <- fmt.Errorf("unable to recv() from close "+
"stream: %v", err)
return return
} }
pendingClose, ok := closeResp.Update.(*lnrpc.CloseStatusUpdate_ClosePending) pendingClose, ok := closeResp.Update.(*lnrpc.CloseStatusUpdate_ClosePending)
@ -1140,11 +1141,13 @@ func (n *NetworkHarness) CloseChannel(ctx context.Context,
closeTxid, err := chainhash.NewHash(pendingClose.ClosePending.Txid) closeTxid, err := chainhash.NewHash(pendingClose.ClosePending.Txid)
if err != nil { if err != nil {
errChan <- err errChan <- fmt.Errorf("unable to decode closeTxid: "+
"%v", err)
return return
} }
if err := n.WaitForTxBroadcast(ctx, *closeTxid); err != nil { if err := n.WaitForTxBroadcast(ctx, *closeTxid); err != nil {
errChan <- err errChan <- fmt.Errorf("error while waiting for "+
"broadcast tx: %v", err)
return return
} }
fin <- closeTxid fin <- closeTxid
@ -1153,9 +1156,6 @@ func (n *NetworkHarness) CloseChannel(ctx context.Context,
// Wait until either the deadline for the context expires, an error // Wait until either the deadline for the context expires, an error
// occurs, or the channel close update is received. // occurs, or the channel close update is received.
select { select {
case <-ctx.Done():
return nil, nil, fmt.Errorf("timeout reached before channel close " +
"initiated")
case err := <-errChan: case err := <-errChan:
return nil, nil, err return nil, nil, err
case closeTxid := <-fin: case closeTxid := <-fin: