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

Revert "Fix warnings; #296"

Browse source 
This reverts commit 40c7a7ffa3.
This commit is contained in:
Vikram Rajkumar 2017-06-03 16:03:52 -05:00
parent 40c7a7ffa3
commit a263279b76
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/app/database_api.cpp
View file

@ -68,8 +68,8 @@ class database_api_impl : public std::enable_shared_from_this<database_api_impl>
map<uint32_t, optional<block_header>> get_block_header_batch(const vector<uint32_t> block_nums)const;
optional<signed_block> get_block(uint32_t block_num)const;
processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const;
optional<operation_history_id_type> get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const;
optional<account_transaction_history_id_type> get_account_transaction_history_id(operation_history_id_type operation_id)const;
operation_history_id_type get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const;
account_transaction_history_id_type get_account_transaction_history_id(operation_history_id_type operation_id)const;
// Globals
chain_property_object get_chain_properties()const;
@ -412,31 +412,29 @@ processed_transaction database_api_impl::get_transaction(uint32_t block_num, uin
return opt_block->transactions[trx_num];
}
optional<operation_history_id_type> database_api::get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const
operation_history_id_type database_api::get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const
{
return my->get_operation_history_id( block_num, trx_in_block, op_in_trx );
}
optional<operation_history_id_type> database_api_impl::get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const
operation_history_id_type database_api_impl::get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const
{
const simple_index<operation_history_object>& op_index = _db.get_index_type<simple_index<operation_history_object>>();
for( const operation_history_object& op : op_index )
{
if(op.block_num == block_num && op.trx_in_block == trx_in_block && op.op_in_trx == op_in_trx) {
if(op.block_num == block_num and op.trx_in_block == trx_in_block and op.op_in_trx == op_in_trx) {
return op.id;
break;
}
}
return {};
}
optional<account_transaction_history_id_type> database_api::get_account_transaction_history_id(operation_history_id_type operation_id)const
account_transaction_history_id_type database_api::get_account_transaction_history_id(operation_history_id_type operation_id)const
{
return my->get_account_transaction_history_id( operation_id );
}
optional<account_transaction_history_id_type> database_api_impl::get_account_transaction_history_id(operation_history_id_type operation_id)const
account_transaction_history_id_type database_api_impl::get_account_transaction_history_id(operation_history_id_type operation_id)const
{
const auto& ath_idx = _db.get_index_type<account_transaction_history_index>();
const auto& ath_by_seq_idx = ath_idx.indices().get<by_seq>();
@ -445,10 +443,9 @@ optional<account_transaction_history_id_type> database_api_impl::get_account_tra
{
if(ath.operation_id == operation_id) {
return ath.id;
break;
}
}
return {};
}

4
libraries/app/include/graphene/app/database_api.hpp
View file

@ -188,12 +188,12 @@ class database_api
/**
* Given a block, transaction in block position and operation position in transaction, get the operation_history_id
*/
optional<operation_history_id_type> get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const;
operation_history_id_type get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)const;
/**
* Given a operation_history_id, get the account_transaction_history_id
*/
optional<account_transaction_history_id_type> get_account_transaction_history_id(operation_history_id_type operation_id)const;
account_transaction_history_id_type get_account_transaction_history_id(operation_history_id_type operation_id)const;
/////////////
// Globals //