Undo superfluous change

peerplays-network · Nov 29, 2019 · 25458c2 · 25458c2
1 parent 8541192
commit 25458c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp
@@ -229,13 +229,12 @@ struct worker_vote_delta
    flat_set<worker_id_type> vote_abstain;
 };
 
-struct signed_block_with_info
+struct signed_block_with_info : public signed_block
 {
    signed_block_with_info();
    signed_block_with_info( const signed_block& block );
    signed_block_with_info( const signed_block_with_info& block ) = default;
 
-   signed_block block;
    block_id_type block_id;
    public_key_type signing_key;
    vector< transaction_id_type > transaction_ids;
@@ -1979,7 +1978,8 @@ FC_REFLECT( graphene::wallet::worker_vote_delta,
    (vote_abstain)
 )
 
-FC_REFLECT( graphene::wallet::signed_block_with_info, (block_id)(signing_key)(transaction_ids) )
+FC_REFLECT_DERIVED( graphene::wallet::signed_block_with_info, (graphene::chain::signed_block),
+   (block_id)(signing_key)(transaction_ids) )
 
 FC_REFLECT_DERIVED( graphene::wallet::vesting_balance_object_with_info, (graphene::chain::vesting_balance_object),
    (allowed_withdraw)(allowed_withdraw_time) )

diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -6191,13 +6191,13 @@ std::vector<matched_bet_object> wallet_api::get_all_matched_bets_for_bettor(acco
 }
 
 // default ctor necessary for FC_REFLECT
-signed_block_with_info::signed_block_with_info( const signed_block& _block )
-   : block( _block )
+signed_block_with_info::signed_block_with_info( const signed_block& block )
+   : signed_block( block )
 {
-   block_id = _block.id();
-   signing_key = _block.signee();
-   transaction_ids.reserve( _block.transactions.size() );
-   for( const processed_transaction& tx : _block.transactions )
+   block_id = id();
+   signing_key = signee();
+   transaction_ids.reserve( transactions.size() );
+   for( const processed_transaction& tx : transactions )
       transaction_ids.push_back( tx.id() );
 }