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

Undo superfluous change

Browse source
This commit is contained in:
Peter Conrad 2019-06-04 13:36:21 +02:00 committed by gladcow
parent 854119233a
commit 25458c294d
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -229,13 +229,12 @@ struct worker_vote_delta
flat_set<worker_id_type> vote_abstain; 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();
signed_block_with_info( const signed_block& block ); signed_block_with_info( const signed_block& block );
signed_block_with_info( const signed_block_with_info& block ) = default; signed_block_with_info( const signed_block_with_info& block ) = default;
signed_block block;
block_id_type block_id; block_id_type block_id;
public_key_type signing_key; public_key_type signing_key;
vector< transaction_id_type > transaction_ids; vector< transaction_id_type > transaction_ids;
@ -1979,7 +1978,8 @@ FC_REFLECT( graphene::wallet::worker_vote_delta,
(vote_abstain) (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), FC_REFLECT_DERIVED( graphene::wallet::vesting_balance_object_with_info, (graphene::chain::vesting_balance_object),
(allowed_withdraw)(allowed_withdraw_time) ) (allowed_withdraw)(allowed_withdraw_time) )

12
libraries/wallet/wallet.cpp
View file

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