Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
5a88a7cf
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
5a88a7cf
编写于
8月 05, 2020
作者:
R
Robert Zaremba
提交者:
GitHub
8月 05, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: use errors.Is for consensus errors check (#21095)
上级
1d25039f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
6 deletion
+6
-6
core/blockchain.go
core/blockchain.go
+6
-6
未找到文件。
core/blockchain.go
浏览文件 @
5a88a7cf
...
...
@@ -1706,13 +1706,13 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, er
}
switch
{
// First block is pruned, insert as sidechain and reorg only if TD grows enough
case
err
==
consensus
.
ErrPrunedAncestor
:
case
err
ors
.
Is
(
err
,
consensus
.
ErrPrunedAncestor
)
:
log
.
Debug
(
"Pruned ancestor, inserting as sidechain"
,
"number"
,
block
.
Number
(),
"hash"
,
block
.
Hash
())
return
bc
.
insertSideChain
(
block
,
it
)
// First block is future, shove it (and all children) to the future queue (unknown ancestor)
case
err
==
consensus
.
ErrFutureBlock
||
(
err
==
consensus
.
ErrUnknownAncestor
&&
bc
.
futureBlocks
.
Contains
(
it
.
first
()
.
ParentHash
()))
:
for
block
!=
nil
&&
(
it
.
index
==
0
||
err
==
consensus
.
ErrUnknownAncestor
)
{
case
err
ors
.
Is
(
err
,
consensus
.
ErrFutureBlock
)
||
(
errors
.
Is
(
err
,
consensus
.
ErrUnknownAncestor
)
&&
bc
.
futureBlocks
.
Contains
(
it
.
first
()
.
ParentHash
()))
:
for
block
!=
nil
&&
(
it
.
index
==
0
||
err
ors
.
Is
(
err
,
consensus
.
ErrUnknownAncestor
)
)
{
log
.
Debug
(
"Future block, postponing import"
,
"number"
,
block
.
Number
(),
"hash"
,
block
.
Hash
())
if
err
:=
bc
.
addFutureBlock
(
block
);
err
!=
nil
{
return
it
.
index
,
err
...
...
@@ -1895,13 +1895,13 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, er
stats
.
report
(
chain
,
it
.
index
,
dirty
)
}
// Any blocks remaining here? The only ones we care about are the future ones
if
block
!=
nil
&&
err
==
consensus
.
ErrFutureBlock
{
if
block
!=
nil
&&
err
ors
.
Is
(
err
,
consensus
.
ErrFutureBlock
)
{
if
err
:=
bc
.
addFutureBlock
(
block
);
err
!=
nil
{
return
it
.
index
,
err
}
block
,
err
=
it
.
next
()
for
;
block
!=
nil
&&
err
==
consensus
.
ErrUnknownAncestor
;
block
,
err
=
it
.
next
()
{
for
;
block
!=
nil
&&
err
ors
.
Is
(
err
,
consensus
.
ErrUnknownAncestor
)
;
block
,
err
=
it
.
next
()
{
if
err
:=
bc
.
addFutureBlock
(
block
);
err
!=
nil
{
return
it
.
index
,
err
}
...
...
@@ -1929,7 +1929,7 @@ func (bc *BlockChain) insertSideChain(block *types.Block, it *insertIterator) (i
// ones. Any other errors means that the block is invalid, and should not be written
// to disk.
err
:=
consensus
.
ErrPrunedAncestor
for
;
block
!=
nil
&&
(
err
==
consensus
.
ErrPrunedAncestor
);
block
,
err
=
it
.
next
()
{
for
;
block
!=
nil
&&
errors
.
Is
(
err
,
consensus
.
ErrPrunedAncestor
);
block
,
err
=
it
.
next
()
{
// Check the canonical state root for that number
if
number
:=
block
.
NumberU64
();
current
.
NumberU64
()
>=
number
{
canonical
:=
bc
.
GetBlockByNumber
(
number
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录