Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
1265a870
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,发现更多精彩内容 >>
提交
1265a870
编写于
7月 14, 2017
作者:
M
Matias Romeo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change ProducersAuthorityThreshold type to UInt32
上级
4756d368
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
8 deletion
+5
-8
libraries/chain/chain_controller.cpp
libraries/chain/chain_controller.cpp
+1
-1
libraries/chain/include/eos/chain/config.hpp
libraries/chain/include/eos/chain/config.hpp
+1
-1
libraries/native_contract/native_contract_chain_initializer.cpp
...ies/native_contract/native_contract_chain_initializer.cpp
+1
-1
tests/tests/special_accounts_tests.cpp
tests/tests/special_accounts_tests.cpp
+2
-5
未找到文件。
libraries/chain/chain_controller.cpp
浏览文件 @
1265a870
...
...
@@ -719,7 +719,7 @@ void chain_controller::update_global_properties(const signed_block& b) {
gpo
.
configuration
=
std
::
move
(
config
);
});
auto
active_producers_authority
=
types
::
Authority
(
uint32_t
(
gpo
.
active_producers
.
size
()
*
config
::
ProducersAuthorityThreshold
)
,
{},
{});
auto
active_producers_authority
=
types
::
Authority
(
config
::
ProducersAuthorityThreshold
,
{},
{});
for
(
auto
&
name
:
gpo
.
active_producers
)
{
active_producers_authority
.
accounts
.
push_back
({{
name
,
config
::
ActiveName
},
1
});
}
...
...
libraries/chain/include/eos/chain/config.hpp
浏览文件 @
1265a870
...
...
@@ -61,7 +61,7 @@ const static ShareType DefaultElectedPay = Asset(100).amount;
const
static
ShareType
DefaultRunnerUpPay
=
Asset
(
75
).
amount
;
const
static
ShareType
DefaultMinEosBalance
=
Asset
(
100
).
amount
;
const
static
UInt32
DefaultMaxTrxLifetime
=
60
*
60
;
const
static
double
ProducersAuthorityThreshold
=
2.0
/
3.0
;
const
static
UInt32
ProducersAuthorityThreshold
=
14
;
const
static
int
BlocksPerRound
=
21
;
const
static
int
VotedProducersPerRound
=
20
;
...
...
libraries/native_contract/native_contract_chain_initializer.cpp
浏览文件 @
1265a870
...
...
@@ -165,7 +165,7 @@ std::vector<chain::Message> native_contract_chain_initializer::prepare_database(
};
auto
empty_authority
=
types
::
Authority
(
0
,
{},
{});
auto
active_producers_authority
=
types
::
Authority
(
uint32_t
(
genesis
.
initial_producers
.
size
()
*
config
::
ProducersAuthorityThreshold
)
,
{},
{});
auto
active_producers_authority
=
types
::
Authority
(
config
::
ProducersAuthorityThreshold
,
{},
{});
for
(
auto
&
p
:
genesis
.
initial_producers
)
{
active_producers_authority
.
accounts
.
push_back
({{
p
.
owner_name
,
config
::
ActiveName
},
1
});
}
...
...
tests/tests/special_accounts_tests.cpp
浏览文件 @
1265a870
...
...
@@ -52,10 +52,9 @@ BOOST_FIXTURE_TEST_CASE(accounts_exists, testing_fixture)
BOOST_CHECK
(
producers
!=
nullptr
);
auto
&
gpo
=
chain_db
.
get
<
global_property_object
>
();
auto
threshold
=
uint32_t
(
gpo
.
active_producers
.
size
()
*
config
::
ProducersAuthorityThreshold
);
const
auto
&
producers_active_authority
=
chain_db
.
get
<
permission_object
,
by_owner
>
(
boost
::
make_tuple
(
config
::
ProducersAccountName
,
config
::
ActiveName
));
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
threshold
,
t
hreshold
);
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
threshold
,
config
::
ProducersAuthorityT
hreshold
);
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
accounts
.
size
(),
gpo
.
active_producers
.
size
());
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
keys
.
size
(),
0
);
...
...
@@ -109,10 +108,8 @@ BOOST_FIXTURE_TEST_CASE(producers_authority, testing_fixture)
BOOST_REQUIRE
(
boost
::
find
(
gpo
.
active_producers
,
"newproducer2"
)
!=
gpo
.
active_producers
.
end
());
BOOST_REQUIRE
(
boost
::
find
(
gpo
.
active_producers
,
"newproducer3"
)
!=
gpo
.
active_producers
.
end
());
auto
threshold
=
uint32_t
(
gpo
.
active_producers
.
size
()
*
config
::
ProducersAuthorityThreshold
);
const
auto
&
producers_active_authority
=
chain_db
.
get
<
permission_object
,
by_owner
>
(
boost
::
make_tuple
(
config
::
ProducersAccountName
,
config
::
ActiveName
));
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
threshold
,
t
hreshold
);
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
threshold
,
config
::
ProducersAuthorityT
hreshold
);
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
accounts
.
size
(),
gpo
.
active_producers
.
size
());
BOOST_CHECK_EQUAL
(
producers_active_authority
.
auth
.
keys
.
size
(),
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录