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

Don't use annotated_object #246

Browse source
This commit is contained in:
theoreticalbts 2015-09-28 11:03:01 -04:00
parent 2cf80cd04a
commit a415dd6604
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/chain/include/graphene/chain/account_object.hpp
View file

@ -41,11 +41,7 @@ namespace graphene { namespace chain {
account_id_type owner; account_id_type owner;
/** /**
* Keep the most recent operation as a root pointer to a linked list of the transaction history. This field is * Keep the most recent operation as a root pointer to a linked list of the transaction history.
* not required by core validation and could in theory be made an annotation on the account object, but
* because transaction history is so common and this object is already cached in the undo buffer (because it
* likely affected the balances of this account) it is convienent to simply track this data here. Account
* balance objects don't currenty inherit from annotated object.
*/ */
account_transaction_history_id_type most_recent_op; account_transaction_history_id_type most_recent_op;
@ -110,7 +106,7 @@ namespace graphene { namespace chain {
* Accounts are the primary unit of authority on the graphene system. Users must have an account in order to use * Accounts are the primary unit of authority on the graphene system. Users must have an account in order to use
* assets, trade in the markets, vote for committee_members, etc. * assets, trade in the markets, vote for committee_members, etc.
*/ */
class account_object : public graphene::db::annotated_object<account_object> class account_object : public graphene::db::abstract_object<account_object>
{ {
public: public:
static const uint8_t space_id = protocol_ids; static const uint8_t space_id = protocol_ids;
@ -312,7 +308,7 @@ namespace graphene { namespace chain {
}} }}
FC_REFLECT_DERIVED( graphene::chain::account_object, FC_REFLECT_DERIVED( graphene::chain::account_object,
(graphene::db::annotated_object<graphene::chain::account_object>), (graphene::db::object),
(membership_expiration_date)(registrar)(referrer)(lifetime_referrer) (membership_expiration_date)(registrar)(referrer)(lifetime_referrer)
(network_fee_percentage)(lifetime_referrer_fee_percentage)(referrer_rewards_percentage) (network_fee_percentage)(lifetime_referrer_fee_percentage)(referrer_rewards_percentage)
(name)(owner)(active)(options)(statistics)(whitelisting_accounts)(blacklisting_accounts) (name)(owner)(active)(options)(statistics)(whitelisting_accounts)(blacklisting_accounts)
@ -322,7 +318,8 @@ FC_REFLECT_DERIVED( graphene::chain::account_balance_object,
(graphene::db::object), (graphene::db::object),
(owner)(asset_type)(balance) ) (owner)(asset_type)(balance) )
FC_REFLECT_DERIVED( graphene::chain::account_statistics_object, (graphene::chain::object), FC_REFLECT_DERIVED( graphene::chain::account_statistics_object,
(graphene::chain::object),
(owner) (owner)
(most_recent_op) (most_recent_op)
(total_core_in_orders) (total_core_in_orders)

5
libraries/chain/include/graphene/chain/asset_object.hpp
View file

@ -68,7 +68,7 @@ namespace graphene { namespace chain {
* All assets have a globally unique symbol name that controls how they are traded and an issuer who * All assets have a globally unique symbol name that controls how they are traded and an issuer who
* has authority over the parameters of the asset. * has authority over the parameters of the asset.
*/ */
class asset_object : public graphene::db::annotated_object<asset_object> class asset_object : public graphene::db::abstract_object<asset_object>
{ {
public: public:
static const uint8_t space_id = protocol_ids; static const uint8_t space_id = protocol_ids;
@ -249,8 +249,7 @@ FC_REFLECT_DERIVED( graphene::chain::asset_bitasset_data_object, (graphene::db::
(settlement_fund) (settlement_fund)
) )
FC_REFLECT_DERIVED( graphene::chain::asset_object, FC_REFLECT_DERIVED( graphene::chain::asset_object, (graphene::db::object),
(graphene::db::annotated_object<graphene::chain::asset_object>),
(symbol) (symbol)
(precision) (precision)
(issuer) (issuer)

2
libraries/chain/include/graphene/chain/market_evaluator.hpp
View file

@ -92,7 +92,7 @@ namespace graphene { namespace chain {
* On the @ref settlement_date the @ref balance will be converted to the collateral asset * On the @ref settlement_date the @ref balance will be converted to the collateral asset
* and paid to @ref owner and then this object will be deleted. * and paid to @ref owner and then this object will be deleted.
*/ */
class force_settlement_object : public graphene::db::annotated_object<force_settlement_object> class force_settlement_object : public abstract_object<force_settlement_object>
{ {
public: public:
static const uint8_t space_id = protocol_ids; static const uint8_t space_id = protocol_ids;