Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
74c32c4e
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,发现更多精彩内容 >>
未验证
提交
74c32c4e
编写于
3月 09, 2018
作者:
D
Daniel Larimer
提交者:
GitHub
3月 09, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1609 from abourget/txn_text_deps_fix
Txn test dependencies fix
上级
f6905950
4c9eed11
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
8 deletion
+10
-8
libraries/chain/chain_controller.cpp
libraries/chain/chain_controller.cpp
+3
-3
libraries/chain/include/eosio/chain/config.hpp
libraries/chain/include/eosio/chain/config.hpp
+2
-2
plugins/net_plugin/net_plugin.cpp
plugins/net_plugin/net_plugin.cpp
+1
-1
plugins/txn_test_gen_plugin/CMakeLists.txt
plugins/txn_test_gen_plugin/CMakeLists.txt
+2
-0
tests/tests/database_tests.cpp
tests/tests/database_tests.cpp
+2
-2
未找到文件。
libraries/chain/chain_controller.cpp
浏览文件 @
74c32c4e
...
...
@@ -43,7 +43,7 @@ bool chain_controller::is_start_of_round( block_num_type block_num )const {
}
uint32_t
chain_controller
::
blocks_per_round
()
const
{
return
get_global_properties
().
active_producers
.
producers
.
size
()
*
config
::
producer_rep
i
titions
;
return
get_global_properties
().
active_producers
.
producers
.
size
()
*
config
::
producer_rep
e
titions
;
}
chain_controller
::
chain_controller
(
const
chain_controller
::
controller_config
&
cfg
)
...
...
@@ -1365,8 +1365,8 @@ account_name chain_controller::get_scheduled_producer(uint32_t slot_num)const
uint64_t
current_aslot
=
dpo
.
current_absolute_slot
+
slot_num
;
const
auto
&
gpo
=
_db
.
get
<
global_property_object
>
();
auto
number_of_active_producers
=
gpo
.
active_producers
.
producers
.
size
();
auto
index
=
current_aslot
%
(
number_of_active_producers
*
config
::
producer_rep
i
titions
);
index
/=
config
::
producer_rep
i
titions
;
auto
index
=
current_aslot
%
(
number_of_active_producers
*
config
::
producer_rep
e
titions
);
index
/=
config
::
producer_rep
e
titions
;
FC_ASSERT
(
gpo
.
active_producers
.
producers
.
size
()
>
0
,
"no producers defined"
);
return
gpo
.
active_producers
.
producers
[
index
].
producer_name
;
...
...
libraries/chain/include/eosio/chain/config.hpp
浏览文件 @
74c32c4e
...
...
@@ -67,13 +67,13 @@ const static uint16_t max_recursion_depth = 6;
/**
* The number of sequential blocks produced by a single producer
*/
const
static
int
producer_rep
i
titions
=
12
;
const
static
int
producer_rep
e
titions
=
12
;
/**
* The number of blocks produced per round is based upon all producers having a chance
* to produce all of their consecutive blocks.
*/
//const static int blocks_per_round = producer_count * producer_rep
i
titions;
//const static int blocks_per_round = producer_count * producer_rep
e
titions;
const
static
int
irreversible_threshold_percent
=
70
*
percent_1
;
...
...
plugins/net_plugin/net_plugin.cpp
浏览文件 @
74c32c4e
...
...
@@ -379,7 +379,7 @@ namespace eosio {
time_point
start_time
;
///< time request made or received
};
struct
handshake_initializer
{
struct
handshake_initializer
{
static
void
populate
(
handshake_message
&
hello
);
};
...
...
plugins/txn_test_gen_plugin/CMakeLists.txt
浏览文件 @
74c32c4e
...
...
@@ -6,3 +6,5 @@ add_library( txn_test_gen_plugin
target_link_libraries
(
txn_test_gen_plugin appbase fc http_plugin chain_plugin
)
target_include_directories
(
txn_test_gen_plugin PUBLIC
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/include"
)
target_include_directories
(
txn_test_gen_plugin PUBLIC
${
CMAKE_BINARY_DIR
}
/contracts
)
add_dependencies
(
txn_test_gen_plugin currency
)
tests/tests/database_tests.cpp
浏览文件 @
74c32c4e
...
...
@@ -65,9 +65,9 @@ BOOST_AUTO_TEST_SUITE(database_tests)
if
(
max_reversible_rounds
==
0
)
{
return
head_block_num
-
1
;
}
else
{
const
auto
current_round
=
head_block_num
/
config
::
producer_rep
i
titions
;
const
auto
current_round
=
head_block_num
/
config
::
producer_rep
e
titions
;
const
auto
irreversible_round
=
current_round
-
max_reversible_rounds
;
return
(
irreversible_round
+
1
)
*
config
::
producer_rep
i
titions
-
1
;
return
(
irreversible_round
+
1
)
*
config
::
producer_rep
e
titions
-
1
;
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录