adjust to monero master branch

src/MicroCore.cpp

@@ -111,10 +111,10 @@ void
 MicroCore::get_output_key(uint64_t amount,
                vector<uint64_t> const& absolute_offsets,
                vector<cryptonote::output_data_t>& outputs) 
-                /*const */
+                const
 {
     core_storage.get_db()
-            .get_output_key(amount,
+            .get_output_key(epee::span<const uint64_t>(&amount, 1),
                             absolute_offsets, outputs);
 }
 
@@ -128,7 +128,7 @@ MicroCore::get_num_outputs(uint64_t amount) const
 
 output_data_t
 MicroCore::get_output_key(uint64_t amount,
-               uint64_t global_amount_index) /*const */
+               uint64_t global_amount_index) const 
 {
     return core_storage.get_db()
                 .get_output_key(amount, global_amount_index);
@@ -190,7 +190,7 @@ std::vector<uint64_t>
 MicroCore::get_tx_amount_output_indices(uint64_t tx_id) const
 {
     return core_storage.get_db()
-            .get_tx_amount_output_indices(tx_id);
+            .get_tx_amount_output_indices(tx_id).front();
 }
 
 bool

src/MicroCore.h

@@ -29,7 +29,7 @@ class AbstractCore
     virtual void 
     get_output_key(uint64_t amount,
                    vector<uint64_t> const& absolute_offsets,
-                   vector<cryptonote::output_data_t>& outputs) /*const*/ = 0;
+                   vector<cryptonote::output_data_t>& outputs) const = 0;
 
     
     virtual void
@@ -110,11 +110,11 @@ public:
     get_output_key(uint64_t amount,
                    vector<uint64_t> const& absolute_offsets,
                    vector<cryptonote::output_data_t>& outputs) 
-                    /*const*/ override;
+                    const override;
 
     virtual output_data_t
     get_output_key(uint64_t amount,
-                   uint64_t global_amount_index) /*const*/; 
+                   uint64_t global_amount_index) const; 
 
     virtual bool
     get_transactions(

src/UniversalIdentifier.hpp

@@ -120,7 +120,7 @@ public:
     Input(address_parse_info const* _a,
            secret_key const* _viewkey,
            known_outputs_t const* _known_outputs,
-           AbstractCore /*const*/* _mcore)
+           AbstractCore const* _mcore)
         : BaseIdentifier(_a, _viewkey),          
           known_outputs {_known_outputs},
           mcore {_mcore}
@@ -158,7 +158,7 @@ protected:
 
     secret_key const* viewkey {nullptr};   
     known_outputs_t const* known_outputs {nullptr};
-    AbstractCore /* const*/* mcore {nullptr};
+    AbstractCore const* mcore {nullptr};
     vector<info> identified_inputs;
 };
 

tests/mocks.h

@@ -78,12 +78,12 @@ public:
 
     MOCK_CONST_METHOD1(get_num_outputs, uint64_t(uint64_t));
 
-    MOCK_METHOD3(get_output_key,
+    MOCK_CONST_METHOD3(get_output_key,
                     void(uint64_t amount,
                          vector<uint64_t> const& absolute_offsets,
                          vector<output_data_t>& outputs));
 
-    MOCK_METHOD2(get_output_key,
+    MOCK_CONST_METHOD2(get_output_key,
                     output_data_t(uint64_t amount,
                                   uint64_t global_amount_index));