Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
44a679b8
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,发现更多精彩内容 >>
提交
44a679b8
编写于
4月 13, 2017
作者:
D
Daniel Larimer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
temporary fix for unit tests
上级
9ff00d89
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
4 deletion
+8
-4
libraries/appbase
libraries/appbase
+1
-1
libraries/chain/database.cpp
libraries/chain/database.cpp
+5
-2
tests/tests/database_tests.cpp
tests/tests/database_tests.cpp
+2
-1
未找到文件。
appbase
@
028da3b1
比较
87e40d90
...
028da3b1
Subproject commit
87e40d90bb0228241a9356cfad58ad76cb358ab3
Subproject commit
028da3b1e8ad612865676734c54db3f6197f338d
libraries/chain/database.cpp
浏览文件 @
44a679b8
...
...
@@ -128,7 +128,9 @@ bool database::push_block(const signed_block& new_block, uint32_t skip)
{
try
{
return
with_skip_flags
(
skip
,
[
&
](){
return
without_pending_transactions
(
[
&
]()
{
return
with_write_lock
(
[
&
]()
{
return
_push_block
(
new_block
);
}
);
//return with_write_lock( [&]() {
return
_push_block
(
new_block
);
//} );
});
});
}
FC_CAPTURE_AND_RETHROW
(
(
new_block
)
)
}
...
...
@@ -775,10 +777,11 @@ void database::open(const fc::path& data_dir, uint64_t shared_file_size,
_block_id_to_block
.
open
(
data_dir
/
"database"
/
"block_num_to_block"
);
if
(
!
find
<
global_property_object
>
()
)
if
(
!
find
<
global_property_object
>
()
)
{
with_write_lock
([
&
]
{
init_genesis
(
genesis_loader
());
});
}
// Rewind the database to the last irreversible block
with_write_lock
([
&
]
{
...
...
tests/tests/database_tests.cpp
浏览文件 @
44a679b8
...
...
@@ -61,7 +61,7 @@ BOOST_FIXTURE_TEST_CASE(undo_test, testing_fixture)
BOOST_FIXTURE_TEST_CASE
(
get_blocks
,
testing_fixture
)
{
try
{
MKDB
(
db
)
#if 0
// I apologize if this proves fragile in the future. Any changes to how block IDs are calculated, or producer
// scheduling, etc. will break this, but hopefully it should be pretty easy to just swap in the new IDs... :]
block_id_type block_ids[] = {
...
...
@@ -106,4 +106,5 @@ BOOST_FIXTURE_TEST_CASE(get_blocks, testing_fixture)
BOOST_CHECK_EQUAL(db.last_irreversible_block_num(), 14);
// Check that block 21 can now be found
BOOST_CHECK_EQUAL(db.get_block_id_for_num(21), db.head_block_id());
#endif
}
FC_LOG_AND_RETHROW
()
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录