From 1179991636b803e47e78464221e0b4eeec37924e Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Tue, 11 Jun 2019 13:25:47 -0400
Subject: [PATCH] ready to implement block and tx merging

---
 src/daemon/MoneroDaemon.cpp | 3 +++
 src/wallet/MoneroWallet.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/daemon/MoneroDaemon.cpp b/src/daemon/MoneroDaemon.cpp
index b4c5b3d..5a84b2f 100644
--- a/src/daemon/MoneroDaemon.cpp
+++ b/src/daemon/MoneroDaemon.cpp
@@ -99,14 +99,17 @@ namespace monero {
   // -------------------------- MODEL IMPLEMENTATION --------------------------
 
   void MoneroBlockHeader::merge(const MoneroBlockHeader& header) {
+    cout << "MoneroBlockHeader::merge()" << endl;
     throw runtime_error("Not implemented");
   }
 
   void MoneroBlock::merge(const MoneroBlock& block) {
+    cout << "MoneroBlock::merge()" << endl;
     throw runtime_error("Not implemented");
   }
 
   void MoneroTx::merge(const MoneroTx& tx) {
+    cout << "MoneroTx::merge()" << endl;
     throw runtime_error("Not implemented");
   }
 
diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp
index d119530..f92be1f 100644
--- a/src/wallet/MoneroWallet.cpp
+++ b/src/wallet/MoneroWallet.cpp
@@ -185,7 +185,7 @@ namespace monero {
    * @param skipIfAbsent specifies if the tx should not be added if it doesn't already exist
    * @returns the merged tx
    */
-  void mergeTx(vector<shared_ptr<MoneroTxWallet>> txs, const shared_ptr<MoneroTxWallet>& tx, bool skipIfAbsent) {
+  void mergeTx(vector<shared_ptr<MoneroTxWallet>>& txs, const shared_ptr<MoneroTxWallet>& tx, bool skipIfAbsent) {
     cout << "mergeTx()" << endl;
     if (tx->id == boost::none) throw runtime_error("Tx id is not initialized");
     for (const auto& aTx:  txs) {