Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
71b7096c
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
71b7096c
编写于
2月 06, 2018
作者:
W
wanderingbort
提交者:
GitHub
2月 06, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1315 from wanderingbort/feature/more-chain_test-fixes
more chain test fixes
上级
1a08bd91
da1550c4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
8 deletion
+20
-8
libraries/chain/chain_controller.cpp
libraries/chain/chain_controller.cpp
+6
-1
libraries/chain/include/eosio/chain/producer_schedule.hpp
libraries/chain/include/eosio/chain/producer_schedule.hpp
+2
-0
tests/chain_tests/transfer_tests.cpp
tests/chain_tests/transfer_tests.cpp
+3
-3
tests/tests/database_tests.cpp
tests/tests/database_tests.cpp
+9
-4
未找到文件。
libraries/chain/chain_controller.cpp
浏览文件 @
71b7096c
...
...
@@ -1290,7 +1290,12 @@ void chain_controller::update_last_irreversible_block()
return
a
->
last_confirmed_block_num
<
b
->
last_confirmed_block_num
;
});
uint32_t
new_last_irreversible_block_num
=
producer_objs
[
offset
]
->
last_confirmed_block_num
-
1
;
uint32_t
new_last_irreversible_block_num
=
producer_objs
[
offset
]
->
last_confirmed_block_num
;
// TODO: right now the code cannot handle the head block being irreversible for reasons that are purely
// implementation details. We can and should remove this special case once the rest of the logic is fixed.
if
(
producer_objs
.
size
()
==
1
)
{
new_last_irreversible_block_num
-=
1
;
}
if
(
new_last_irreversible_block_num
>
dpo
.
last_irreversible_block_num
)
{
...
...
libraries/chain/include/eosio/chain/producer_schedule.hpp
浏览文件 @
71b7096c
...
...
@@ -33,6 +33,7 @@ namespace eosio { namespace chain {
shared_producer_schedule_type
&
operator
=
(
const
producer_schedule_type
&
a
)
{
version
=
a
.
version
;
producers
.
clear
();
producers
.
reserve
(
a
.
producers
.
size
()
);
for
(
const
auto
&
p
:
a
.
producers
)
producers
.
push_back
(
p
);
...
...
@@ -55,6 +56,7 @@ namespace eosio { namespace chain {
inline
bool
operator
==
(
const
producer_schedule_type
&
a
,
const
producer_schedule_type
&
b
)
{
if
(
a
.
version
!=
b
.
version
)
return
false
;
if
(
a
.
producers
.
size
()
!=
b
.
producers
.
size
()
)
return
false
;
for
(
uint32_t
i
=
0
;
i
<
a
.
producers
.
size
();
++
i
)
if
(
a
.
producers
[
i
]
!=
b
.
producers
[
i
]
)
return
false
;
return
true
;
...
...
tests/chain_tests/transfer_tests.cpp
浏览文件 @
71b7096c
...
...
@@ -178,12 +178,12 @@ BOOST_AUTO_TEST_CASE( transfer_delegation ) { try {
(
"name"
,
"transfer"
)
(
"authorization"
,
variants
({
mutable_variant_object
()
(
"actor"
,
"
bart
"
)
(
"actor"
,
"
dan
"
)
(
"permission"
,
name
(
config
::
active_name
).
to_string
())
}))
(
"data"
,
mutable_variant_object
()
(
"from"
,
"
bart
"
)
(
"to"
,
"
dan
"
)
(
"from"
,
"
dan
"
)
(
"to"
,
"
trust
"
)
(
"quantity"
,
amount
)
(
"memo"
,
"memo"
)
)
...
...
tests/tests/database_tests.cpp
浏览文件 @
71b7096c
...
...
@@ -58,12 +58,17 @@ BOOST_AUTO_TEST_SUITE(database_tests)
}
// Utility function to check expected irreversible block
auto
calc_exp_last_irr_block_num
=
[
&
](
uint32_t
head_block_num
)
{
auto
calc_exp_last_irr_block_num
=
[
&
](
uint32_t
head_block_num
)
->
uint32_t
{
const
global_property_object
&
gpo
=
test
.
control
->
get_global_properties
();
const
auto
producers_size
=
gpo
.
active_producers
.
producers
.
size
();
const
auto
min_producers
=
EOS_PERCENT
(
producers_size
,
config
::
irreversible_threshold_percent
);
return
head_block_num
-
(((
min_producers
-
1
)
*
config
::
producer_repititions
)
+
1
+
(
head_block_num
%
config
::
producer_repititions
));
const
auto
max_reversible_rounds
=
EOS_PERCENT
(
producers_size
,
config
::
percent_100
-
config
::
irreversible_threshold_percent
);
if
(
max_reversible_rounds
==
0
)
{
return
head_block_num
-
1
;
}
else
{
const
auto
current_round
=
head_block_num
/
config
::
producer_repititions
;
const
auto
irreversible_round
=
current_round
-
max_reversible_rounds
;
return
(
irreversible_round
+
1
)
*
config
::
producer_repititions
-
1
;
}
};
// Check the last irreversible block number is set correctly
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录