diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index cf5239af..8e5b92df 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -260,7 +260,7 @@ namespace graphene { namespace app { { case impl_global_property_object_type:{ } case impl_dynamic_global_property_object_type:{ - } case impl_index_meta_object_type:{ + } case impl_reserved0_object_type:{ } case impl_asset_dynamic_data_type:{ } case impl_asset_bitasset_data_type:{ break; diff --git a/libraries/chain/include/graphene/chain/account_object.hpp b/libraries/chain/include/graphene/chain/account_object.hpp index c8e54842..a6801684 100644 --- a/libraries/chain/include/graphene/chain/account_object.hpp +++ b/libraries/chain/include/graphene/chain/account_object.hpp @@ -220,20 +220,6 @@ namespace graphene { namespace chain { account_id_type get_id()const { return id; } }; - /** - * This object is attached as the meta annotation on the account object, this information is not relevant to - * validation. - */ - class meta_account_object : public graphene::db::abstract_object - { - public: - static const uint8_t space_id = implementation_ids; - static const uint8_t type_id = meta_account_object_type; - - public_key_type memo_key; - committee_member_id_type committee_member_id; // optional - }; - /** * @brief This secondary index will allow a reverse lookup of all accounts that a particular key or account * is an potential signing authority. @@ -336,10 +322,6 @@ FC_REFLECT_DERIVED( graphene::chain::account_balance_object, (graphene::db::object), (owner)(asset_type)(balance) ) -FC_REFLECT_DERIVED( graphene::chain::meta_account_object, - (graphene::db::object), - (memo_key)(committee_member_id) ) - FC_REFLECT_DERIVED( graphene::chain::account_statistics_object, (graphene::chain::object), (owner) (most_recent_op) diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index 897d2666..8cd52866 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -132,7 +132,7 @@ namespace graphene { namespace chain { { impl_global_property_object_type, impl_dynamic_global_property_object_type, - impl_index_meta_object_type, + impl_reserved0_object_type, // formerly index_meta_object_type, TODO: delete me impl_asset_dynamic_data_type, impl_asset_bitasset_data_type, impl_account_balance_object_type, @@ -145,12 +145,6 @@ namespace graphene { namespace chain { impl_witness_schedule_object_type }; - enum meta_info_object_type - { - meta_asset_object_type, - meta_account_object_type - }; - //typedef fc::unsigned_int object_id_type; //typedef uint64_t object_id_type; class account_object; @@ -186,7 +180,6 @@ namespace graphene { namespace chain { // implementation types class global_property_object; class dynamic_global_property_object; - class index_meta_object; class asset_dynamic_data_object; class asset_bitasset_data_object; class account_balance_object; @@ -277,7 +270,7 @@ FC_REFLECT_ENUM( graphene::chain::object_type, FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_global_property_object_type) (impl_dynamic_global_property_object_type) - (impl_index_meta_object_type) + (impl_reserved0_object_type) (impl_asset_dynamic_data_type) (impl_asset_bitasset_data_type) (impl_account_balance_object_type) @@ -290,8 +283,6 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_witness_schedule_object_type) ) -FC_REFLECT_ENUM( graphene::chain::meta_info_object_type, (meta_account_object_type)(meta_asset_object_type) ) - FC_REFLECT_TYPENAME( graphene::chain::share_type ) FC_REFLECT_TYPENAME( graphene::chain::account_id_type )