Merge branch 'v0.35.x' into callum/mempool-full-error

This commit is contained in:
Callum Waters
2022-07-05 19:40:03 +02:00
committed by GitHub

View File

@@ -296,7 +296,7 @@ func (c *mConnConnection) Handshake(
select {
case <-handshakeCtx.Done():
_ = c.Close()
return types.NodeInfo{}, nil, ctx.Err()
return types.NodeInfo{}, nil, handshakeCtx.Err()
case err := <-errCh:
if err != nil {