Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
78cc137b
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,发现更多精彩内容 >>
未验证
提交
78cc137b
编写于
5月 14, 2018
作者:
D
Daniel Larimer
提交者:
GitHub
5月 14, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3027 from taokayan/delay_expire
fix expired delay txn handling, add test case for 2071
上级
96ba02ca
dc418b75
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
41 addition
and
0 deletion
+41
-0
libraries/chain/controller.cpp
libraries/chain/controller.cpp
+1
-0
unittests/delay_tests.cpp
unittests/delay_tests.cpp
+40
-0
未找到文件。
libraries/chain/controller.cpp
浏览文件 @
78cc137b
...
@@ -463,6 +463,7 @@ struct controller_impl {
...
@@ -463,6 +463,7 @@ struct controller_impl {
trace
->
id
=
gto
.
trx_id
;
trace
->
id
=
gto
.
trx_id
;
trace
->
scheduled
=
false
;
trace
->
scheduled
=
false
;
trace
->
receipt
=
push_receipt
(
gto
.
trx_id
,
transaction_receipt
::
expired
,
billed_cpu_time_us
,
0
);
// expire the transaction
trace
->
receipt
=
push_receipt
(
gto
.
trx_id
,
transaction_receipt
::
expired
,
billed_cpu_time_us
,
0
);
// expire the transaction
undo_session
.
squash
();
return
trace
;
return
trace
;
}
}
...
...
unittests/delay_tests.cpp
浏览文件 @
78cc137b
...
@@ -2392,4 +2392,44 @@ BOOST_AUTO_TEST_CASE( max_transaction_delay_execute ) { try {
...
@@ -2392,4 +2392,44 @@ BOOST_AUTO_TEST_CASE( max_transaction_delay_execute ) { try {
}
FC_LOG_AND_RETHROW
()
}
}
FC_LOG_AND_RETHROW
()
}
BOOST_FIXTURE_TEST_CASE
(
delay_expired
,
validating_tester
)
{
try
{
produce_blocks
(
2
);
signed_transaction
trx
;
account_name
a
=
N
(
newco
);
account_name
creator
=
config
::
system_account_name
;
auto
owner_auth
=
authority
(
get_public_key
(
a
,
"owner"
)
);
trx
.
actions
.
emplace_back
(
vector
<
permission_level
>
{{
creator
,
config
::
active_name
}},
newaccount
{
.
creator
=
creator
,
.
name
=
a
,
.
owner
=
owner_auth
,
.
active
=
authority
(
get_public_key
(
a
,
"active"
)
)
});
set_transaction_headers
(
trx
);
trx
.
delay_sec
=
3
;
trx
.
expiration
=
control
->
head_block_time
()
+
fc
::
microseconds
(
1000000
);
trx
.
sign
(
get_private_key
(
creator
,
"active"
),
chain_id_type
()
);
auto
trace
=
push_transaction
(
trx
);
BOOST_REQUIRE_EQUAL
(
transaction_receipt_header
::
delayed
,
trace
->
receipt
->
status
);
signed_block_ptr
sb
=
produce_block
();
sb
=
produce_block
();
BOOST_REQUIRE_EQUAL
(
transaction_receipt_header
::
delayed
,
trace
->
receipt
->
status
);
produce_empty_block
(
fc
::
milliseconds
(
610
*
1000
));
sb
=
produce_block
();
BOOST_REQUIRE_EQUAL
(
1
,
sb
->
transactions
.
size
());
BOOST_REQUIRE_EQUAL
(
transaction_receipt_header
::
expired
,
sb
->
transactions
[
0
].
status
);
create_account
(
a
);
// account can still be created
}
FC_LOG_AND_RETHROW
()
}
BOOST_AUTO_TEST_SUITE_END
()
BOOST_AUTO_TEST_SUITE_END
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录