Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
f259c245
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,发现更多精彩内容 >>
未验证
提交
f259c245
编写于
5月 24, 2018
作者:
A
arhag
提交者:
GitHub
5月 24, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into 3343-validate-configuration
上级
51c5d4a4
3e68d667
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
8 deletion
+3
-8
contracts/eosio.system/producer_pay.cpp
contracts/eosio.system/producer_pay.cpp
+0
-3
contracts/eosio.system/voting.cpp
contracts/eosio.system/voting.cpp
+1
-1
libraries/testing/tester.cpp
libraries/testing/tester.cpp
+1
-3
unittests/eosio.system_tests.cpp
unittests/eosio.system_tests.cpp
+1
-1
未找到文件。
contracts/eosio.system/producer_pay.cpp
浏览文件 @
f259c245
...
...
@@ -47,10 +47,7 @@ namespace eosiosystem {
if
(
timestamp
.
slot
-
_gstate
.
last_producer_schedule_update
.
slot
>
120
)
{
update_elected_producers
(
timestamp
);
print
(
"maybe update bids
\n
"
);
if
(
(
timestamp
.
slot
-
_gstate
.
last_name_close
.
slot
)
>
blocks_per_day
)
{
print
(
"update bids"
);
name_bid_table
bids
(
_self
,
_self
);
auto
idx
=
bids
.
get_index
<
N
(
highbid
)
>
();
auto
highest
=
idx
.
begin
();
...
...
contracts/eosio.system/voting.cpp
浏览文件 @
f259c245
...
...
@@ -84,7 +84,7 @@ namespace eosiosystem {
_producers
.
modify
(
*
it
,
0
,
[
&
](
auto
&
p
)
{
p
.
time_became_active
=
block_time
;
});
}
else
if
(
block_time
.
slot
>
2
*
21
*
12
+
it
->
time_became_active
.
slot
&&
}
else
if
(
block_time
.
slot
>
(
2
*
21
*
12
*
100
)
+
it
->
time_became_active
.
slot
&&
block_time
.
slot
>
it
->
last_produced_block_time
.
slot
+
blocks_per_day
)
{
_producers
.
modify
(
*
it
,
0
,
[
&
](
auto
&
p
)
{
p
.
producer_key
=
public_key
();
...
...
libraries/testing/tester.cpp
浏览文件 @
f259c245
...
...
@@ -294,9 +294,7 @@ namespace eosio { namespace testing {
_start_block
(
control
->
head_block_time
()
+
fc
::
microseconds
(
config
::
block_interval_us
));
auto
c
=
packed_transaction
::
none
;
if
(
fc
::
raw
::
pack_size
(
trx
)
>
1000
)
{
wdump
((
fc
::
raw
::
pack_size
(
trx
)));
if
(
fc
::
raw
::
pack_size
(
trx
)
>
1000
)
{
c
=
packed_transaction
::
zlib
;
}
...
...
unittests/eosio.system_tests.cpp
浏览文件 @
f259c245
...
...
@@ -1576,7 +1576,7 @@ BOOST_FIXTURE_TEST_CASE(multiple_producer_pay, eosio_system_tester, * boost::uni
// re-register deactivated producer and let him produce blocks again
const
uint32_t
initial_unpaid_blocks
=
inactive_prod_info
[
"unpaid_blocks"
].
as
<
uint32_t
>
();
regproducer
(
producer_names
[
one_inactive_index
]);
produce_blocks
(
21
*
12
);
produce_blocks
(
21
*
12
*
100
);
auto
reactivated_prod_info
=
get_producer_info
(
producer_names
[
one_inactive_index
]);
const
uint32_t
unpaid_blocks
=
reactivated_prod_info
[
"unpaid_blocks"
].
as
<
uint32_t
>
();
BOOST_REQUIRE
(
initial_unpaid_blocks
+
12
<=
unpaid_blocks
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录