From 40c7a7ffa386c9418c70b0555de0bb46b2ea5d7c Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Fri, 2 Jun 2017 19:38:30 -0500
Subject: [PATCH] Fix warnings; #296

---
 libraries/app/database_api.cpp                | 21 +++++++++++--------
 .../app/include/graphene/app/database_api.hpp |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp
index cd941b5c..eec6348b 100644
--- a/libraries/app/database_api.cpp
+++ b/libraries/app/database_api.cpp
@@ -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;
-      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;
+      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;
 
       // Globals
       chain_property_object get_chain_properties()const;
@@ -412,29 +412,31 @@ processed_transaction database_api_impl::get_transaction(uint32_t block_num, uin
    return opt_block->transactions[trx_num];
 }
 
-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
+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
 {
    return my->get_operation_history_id( block_num, trx_in_block, op_in_trx );
 }
 
-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
+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
 {
    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 and op.trx_in_block == trx_in_block and op.op_in_trx == op_in_trx) {
+      if(op.block_num == block_num && op.trx_in_block == trx_in_block && op.op_in_trx == op_in_trx) {
          return op.id;
-         break;
       }
    }
+
+   return {};
 }
-account_transaction_history_id_type database_api::get_account_transaction_history_id(operation_history_id_type operation_id)const
+
+optional<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 );
 }
 
-account_transaction_history_id_type database_api_impl::get_account_transaction_history_id(operation_history_id_type operation_id)const
+optional<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>();
@@ -443,9 +445,10 @@ account_transaction_history_id_type database_api_impl::get_account_transaction_h
    {
       if(ath.operation_id == operation_id) {
          return ath.id;
-         break;
       }
    }
+
+   return {};
 }
 
 
diff --git a/libraries/app/include/graphene/app/database_api.hpp b/libraries/app/include/graphene/app/database_api.hpp
index 131d2dc2..a7d1e877 100644
--- a/libraries/app/include/graphene/app/database_api.hpp
+++ b/libraries/app/include/graphene/app/database_api.hpp
@@ -188,12 +188,12 @@ class database_api
       /**
       * Given a block, transaction in block position and operation position in transaction, get the operation_history_id
       */
-      operation_history_id_type get_operation_history_id(uint32_t block_num, uint32_t trx_in_block, uint32_t op_in_trx)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;
 
       /**
       * Given a operation_history_id, get the account_transaction_history_id
       */
-      account_transaction_history_id_type get_account_transaction_history_id(operation_history_id_type operation_id)const;
+      optional<account_transaction_history_id_type> get_account_transaction_history_id(operation_history_id_type operation_id)const;
 
       /////////////
       // Globals //