浏览代码

Merge pull request #471 from guagualvcha/down_nil_issue

[R4R]fix downloader nil issue when the header is mising
zjubfd 4 年之前
父节点
当前提交
b6035c1afa
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      eth/downloader/downloader.go

+ 2 - 2
eth/downloader/downloader.go

@@ -1028,8 +1028,8 @@ func (d *Downloader) findAncestorBinarySearch(p *peerConnection, mode SyncMode,
 				}
 				}
 				header := d.lightchain.GetHeaderByHash(h) // Independent of sync mode, header surely exists
 				header := d.lightchain.GetHeaderByHash(h) // Independent of sync mode, header surely exists
 				if header == nil {
 				if header == nil {
-					p.log.Error("header not found", "number", header.Number, "hash", header.Hash(), "request", check)
-					return 0, fmt.Errorf("%w: header no found (%d)", errBadPeer, header.Number)
+					p.log.Error("header not found", "hash", h, "request", check)
+					return 0, fmt.Errorf("%w: header no found (%s)", errBadPeer, h)
 				}
 				}
 				if header.Number.Uint64() != check {
 				if header.Number.Uint64() != check {
 					p.log.Warn("Received non requested header", "number", header.Number, "hash", header.Hash(), "request", check)
 					p.log.Warn("Received non requested header", "number", header.Number, "hash", header.Hash(), "request", check)