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

Switch object id types

Browse source
This commit is contained in:
Peter Conrad 2018-09-10 15:20:37 +02:00
parent b0afddaa6b
commit eb5100545f
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
libraries/chain/include/graphene/chain/protocol/types.hpp
View file

@ -134,6 +134,10 @@ namespace graphene { namespace chain {
vesting_balance_object_type, vesting_balance_object_type,
worker_object_type, worker_object_type,
balance_object_type, balance_object_type,
tournament_object_type,
tournament_details_object_type,
match_object_type,
game_object_type,
sport_object_type, sport_object_type,
event_group_object_type, event_group_object_type,
event_object_type, event_object_type,
@ -141,10 +145,6 @@ namespace graphene { namespace chain {
betting_market_group_object_type, betting_market_group_object_type,
betting_market_object_type, betting_market_object_type,
bet_object_type, bet_object_type,
tournament_object_type,
tournament_details_object_type,
match_object_type,
game_object_type,
OBJECT_TYPE_COUNT ///< Sentry value which contains the number of different object types OBJECT_TYPE_COUNT ///< Sentry value which contains the number of different object types
}; };
@ -167,11 +167,11 @@ namespace graphene { namespace chain {
impl_special_authority_object_type, impl_special_authority_object_type,
impl_buyback_object_type, impl_buyback_object_type,
impl_fba_accumulator_object_type, impl_fba_accumulator_object_type,
impl_betting_market_position_object_type,
impl_global_betting_statistics_object_type,
impl_asset_dividend_data_type, impl_asset_dividend_data_type,
impl_pending_dividend_payout_balance_for_holder_object_type, impl_pending_dividend_payout_balance_for_holder_object_type,
impl_distributed_dividend_balance_data_type impl_distributed_dividend_balance_data_type,
impl_betting_market_position_object_type,
impl_global_betting_statistics_object_type
}; };
//typedef fc::unsigned_int object_id_type; //typedef fc::unsigned_int object_id_type;
@ -191,6 +191,10 @@ namespace graphene { namespace chain {
class worker_object; class worker_object;
class balance_object; class balance_object;
class blinded_balance_object; class blinded_balance_object;
class tournament_object;
class tournament_details_object;
class match_object;
class game_object;
class sport_object; class sport_object;
class event_group_object; class event_group_object;
class event_object; class event_object;
@ -198,10 +202,6 @@ namespace graphene { namespace chain {
class betting_market_group_object; class betting_market_group_object;
class betting_market_object; class betting_market_object;
class bet_object; class bet_object;
class tournament_object;
class tournament_details_object;
class match_object;
class game_object;
typedef object_id< protocol_ids, account_object_type, account_object> account_id_type; typedef object_id< protocol_ids, account_object_type, account_object> account_id_type;
typedef object_id< protocol_ids, asset_object_type, asset_object> asset_id_type; typedef object_id< protocol_ids, asset_object_type, asset_object> asset_id_type;
@ -217,6 +217,10 @@ namespace graphene { namespace chain {
typedef object_id< protocol_ids, vesting_balance_object_type, vesting_balance_object> vesting_balance_id_type; typedef object_id< protocol_ids, vesting_balance_object_type, vesting_balance_object> vesting_balance_id_type;
typedef object_id< protocol_ids, worker_object_type, worker_object> worker_id_type; typedef object_id< protocol_ids, worker_object_type, worker_object> worker_id_type;
typedef object_id< protocol_ids, balance_object_type, balance_object> balance_id_type; typedef object_id< protocol_ids, balance_object_type, balance_object> balance_id_type;
typedef object_id< protocol_ids, tournament_object_type, tournament_object> tournament_id_type;
typedef object_id< protocol_ids, tournament_details_object_type, tournament_details_object> tournament_details_id_type;
typedef object_id< protocol_ids, match_object_type, match_object> match_id_type;
typedef object_id< protocol_ids, game_object_type, game_object> game_id_type;
typedef object_id< protocol_ids, sport_object_type, sport_object> sport_id_type; typedef object_id< protocol_ids, sport_object_type, sport_object> sport_id_type;
typedef object_id< protocol_ids, event_group_object_type, event_group_object> event_group_id_type; typedef object_id< protocol_ids, event_group_object_type, event_group_object> event_group_id_type;
typedef object_id< protocol_ids, event_object_type, event_object> event_id_type; typedef object_id< protocol_ids, event_object_type, event_object> event_id_type;
@ -224,10 +228,6 @@ namespace graphene { namespace chain {
typedef object_id< protocol_ids, betting_market_group_object_type, betting_market_group_object> betting_market_group_id_type; typedef object_id< protocol_ids, betting_market_group_object_type, betting_market_group_object> betting_market_group_id_type;
typedef object_id< protocol_ids, betting_market_object_type, betting_market_object> betting_market_id_type; typedef object_id< protocol_ids, betting_market_object_type, betting_market_object> betting_market_id_type;
typedef object_id< protocol_ids, bet_object_type, bet_object> bet_id_type; typedef object_id< protocol_ids, bet_object_type, bet_object> bet_id_type;
typedef object_id< protocol_ids, tournament_object_type, tournament_object> tournament_id_type;
typedef object_id< protocol_ids, tournament_details_object_type, tournament_details_object> tournament_details_id_type;
typedef object_id< protocol_ids, match_object_type, match_object> match_id_type;
typedef object_id< protocol_ids, game_object_type, game_object> game_id_type;
// implementation types // implementation types
class global_property_object; class global_property_object;
@ -245,11 +245,10 @@ namespace graphene { namespace chain {
class special_authority_object; class special_authority_object;
class buyback_object; class buyback_object;
class fba_accumulator_object; class fba_accumulator_object;
class betting_market_position_object;
class global_betting_statistics_object;
class tournament_details_object;
class asset_dividend_data_object; class asset_dividend_data_object;
class pending_dividend_payout_balance_for_holder_object; class pending_dividend_payout_balance_for_holder_object;
class betting_market_position_object;
class global_betting_statistics_object;
typedef object_id< implementation_ids, impl_global_property_object_type, global_property_object> global_property_id_type; typedef object_id< implementation_ids, impl_global_property_object_type, global_property_object> global_property_id_type;
typedef object_id< implementation_ids, impl_dynamic_global_property_object_type, dynamic_global_property_object> dynamic_global_property_id_type; typedef object_id< implementation_ids, impl_dynamic_global_property_object_type, dynamic_global_property_object> dynamic_global_property_id_type;
@ -392,6 +391,10 @@ FC_REFLECT_ENUM( graphene::chain::object_type,
(vesting_balance_object_type) (vesting_balance_object_type)
(worker_object_type) (worker_object_type)
(balance_object_type) (balance_object_type)
(tournament_object_type)
(tournament_details_object_type)
(match_object_type)
(game_object_type)
(sport_object_type) (sport_object_type)
(event_group_object_type) (event_group_object_type)
(event_object_type) (event_object_type)
@ -399,10 +402,6 @@ FC_REFLECT_ENUM( graphene::chain::object_type,
(betting_market_group_object_type) (betting_market_group_object_type)
(betting_market_object_type) (betting_market_object_type)
(bet_object_type) (bet_object_type)
(tournament_object_type)
(tournament_details_object_type)
(match_object_type)
(game_object_type)
(OBJECT_TYPE_COUNT) (OBJECT_TYPE_COUNT)
) )
FC_REFLECT_ENUM( graphene::chain::impl_object_type, FC_REFLECT_ENUM( graphene::chain::impl_object_type,
@ -423,11 +422,11 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type,
(impl_special_authority_object_type) (impl_special_authority_object_type)
(impl_buyback_object_type) (impl_buyback_object_type)
(impl_fba_accumulator_object_type) (impl_fba_accumulator_object_type)
(impl_betting_market_position_object_type)
(impl_global_betting_statistics_object_type)
(impl_asset_dividend_data_type) (impl_asset_dividend_data_type)
(impl_pending_dividend_payout_balance_for_holder_object_type) (impl_pending_dividend_payout_balance_for_holder_object_type)
(impl_distributed_dividend_balance_data_type) (impl_distributed_dividend_balance_data_type)
(impl_betting_market_position_object_type)
(impl_global_betting_statistics_object_type)
) )
FC_REFLECT_TYPENAME( graphene::chain::share_type ) FC_REFLECT_TYPENAME( graphene::chain::share_type )