Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Remove active_witnesses from global_property_object #562

Browse source
This commit is contained in:
theoreticalbts 2016-02-09 04:06:01 -05:00
parent 19cf1b135b
commit 3a968332e8
4 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/db_init.cpp
View file

@ -636,7 +636,6 @@ void database::init_genesis(const genesis_state_type& genesis_state)
for( uint32_t i = 1; i <= genesis_state.initial_active_witnesses; ++i ) for( uint32_t i = 1; i <= genesis_state.initial_active_witnesses; ++i )
{ {
p.active_witnesses.insert(i); p.active_witnesses.insert(i);
p.witness_accounts.insert(get(witness_id_type(i)).witness_account);
} }
}); });

7
libraries/chain/db_maint.cpp
View file

@ -213,13 +213,6 @@ void database::update_active_witnesses()
[](const witness_object& w) { [](const witness_object& w) {
return w.id; return w.id;
}); });
gp.witness_accounts.clear();
gp.witness_accounts.reserve(wits.size());
std::transform(wits.begin(), wits.end(),
std::inserter(gp.witness_accounts, gp.witness_accounts.end()),
[](const witness_object& w) {
return w.witness_account;
});
}); });
} FC_CAPTURE_AND_RETHROW() } } FC_CAPTURE_AND_RETHROW() }

1
libraries/chain/include/graphene/chain/global_property_object.hpp
View file

@ -49,7 +49,6 @@ namespace graphene { namespace chain {
vector<committee_member_id_type> active_committee_members; // updated once per maintenance interval vector<committee_member_id_type> active_committee_members; // updated once per maintenance interval
flat_set<witness_id_type> active_witnesses; // updated once per maintenance interval flat_set<witness_id_type> active_witnesses; // updated once per maintenance interval
// n.b. witness scheduling is done by witness_schedule object // n.b. witness scheduling is done by witness_schedule object
flat_set<account_id_type> witness_accounts; // updated once per maintenance interval
}; };
/** /**

5
tests/tests/operation_tests.cpp
View file

@ -1137,8 +1137,9 @@ BOOST_AUTO_TEST_CASE( witness_feeds )
generate_block(); generate_block();
const asset_object& bit_usd = get_asset("USDBIT"); const asset_object& bit_usd = get_asset("USDBIT");
auto& global_props = db.get_global_properties(); auto& global_props = db.get_global_properties();
const vector<account_id_type> active_witnesses(global_props.witness_accounts.begin(), vector<account_id_type> active_witnesses;
global_props.witness_accounts.end()); for( const witness_id_type& wit_id : global_props.active_witnesses )
active_witnesses.push_back( wit_id(db).witness_account );
BOOST_REQUIRE_EQUAL(active_witnesses.size(), 10); BOOST_REQUIRE_EQUAL(active_witnesses.size(), 10);
asset_publish_feed_operation op; asset_publish_feed_operation op;