Merge conflicts

This commit is contained in:
Ferran Borreguero 2021-10-14 12:50:41 +02:00
parent ecc0fb1e56
commit e4eceefbb0

View file

@ -815,7 +815,7 @@ func (d *Downloader) findAncestor(p *peerConnection, remoteHeader *types.Header)
return 0, err
}
ancestor, err = d.findAncestorBinarySearch(p, mode, localHeight, floor)
ancestor, err = d.findAncestorBinarySearch(p, mode, localHeight+1, floor)
if err != nil {
return 0, err
}