Passes existing vesting withdraw tests #78

steemit · Jun 13, 2016 · 0f412b3 · 0f412b3
1 parent 91aa9d2
commit 0f412b3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/libraries/chain/database.cpp b/libraries/chain/database.cpp
@@ -2106,22 +2106,23 @@ void database::initialize_indexes()
    auto acnt_index = add_index< primary_index<account_index> >();
    acnt_index->add_secondary_index<account_member_index>();
 
-   add_index< primary_index<witness_index> >();
-   add_index< primary_index<witness_vote_index> >();
-   add_index< primary_index<category_index> >();
-   add_index< primary_index<comment_index> >();
-   add_index< primary_index<comment_vote_index> >();
-   add_index< primary_index<convert_index> >();
-   add_index< primary_index<liquidity_reward_index> >();
-   add_index< primary_index<limit_order_index> >();
+   add_index< primary_index< witness_index > >();
+   add_index< primary_index< witness_vote_index > >();
+   add_index< primary_index< category_index > >();
+   add_index< primary_index< comment_index > >();
+   add_index< primary_index< comment_vote_index > >();
+   add_index< primary_index< convert_index > >();
+   add_index< primary_index< liquidity_reward_index > >();
+   add_index< primary_index< limit_order_index > >();
 
    //Implementation object indexes
-   add_index< primary_index<transaction_index                             > >();
-   add_index< primary_index<simple_index<dynamic_global_property_object  >> >();
-   add_index< primary_index<simple_index<feed_history_object  >> >();
-   add_index< primary_index<flat_index<  block_summary_object            >> >();
-   add_index< primary_index<simple_index<witness_schedule_object        > > >();
-   add_index< primary_index<simple_index<hardfork_property_object       > > >();
+   add_index< primary_index< transaction_index                             > >();
+   add_index< primary_index< simple_index< dynamic_global_property_object  > > >();
+   add_index< primary_index< simple_index< feed_history_object             > > >();
+   add_index< primary_index< flat_index<   block_summary_object            > > >();
+   add_index< primary_index< simple_index< witness_schedule_object         > > >();
+   add_index< primary_index< simple_index< hardfork_property_object        > > >();
+   add_index< primary_index< withdraw_vesting_destination_index            > >();
 }
 
 void database::init_genesis( uint64_t init_supply )

diff --git a/libraries/chain/include/steemit/chain/steem_objects.hpp b/libraries/chain/include/steemit/chain/steem_objects.hpp
@@ -215,3 +215,6 @@ FC_REFLECT_DERIVED( steemit::chain::convert_request_object, (graphene::db::objec
 
 FC_REFLECT_DERIVED( steemit::chain::liquidity_reward_balance_object, (graphene::db::object),
                     (owner)(steem_volume)(sbd_volume)(last_update) )
+
+FC_REFLECT_DERIVED( steemit::chain::withdraw_vesting_destination_object, (graphene::db::object),
+                    (from_account)(to_account)(percent)(auto_vest) )