From 9b181df21c71ecab6261d6d5f1c9a07ffafbcf0d Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Thu, 13 Jun 2019 08:05:56 -0400
Subject: [PATCH] returning from block.merge()

---
 src/daemon/MoneroDaemon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/daemon/MoneroDaemon.cpp b/src/daemon/MoneroDaemon.cpp
index e0926bc..ed82ae7 100644
--- a/src/daemon/MoneroDaemon.cpp
+++ b/src/daemon/MoneroDaemon.cpp
@@ -138,7 +138,7 @@ namespace monero {
       for (const shared_ptr<MoneroTx>& thatTx : block.txs) {
         bool found = false;
         for (const shared_ptr<MoneroTx>& thisTx : txs) {
-          if (thatTx->id == thatTx->id) {
+          if (thatTx->id == thisTx->id) {
             thisTx->merge(*thatTx);
             found = true;
             break;
@@ -156,7 +156,7 @@ namespace monero {
     // merge other fields
     hex = MoneroUtils::reconcile(hex, block.hex);
     //txIds = MoneroUtils::reconcile(txIds, block.txIds); // TODO: implement
-    throw runtime_error("ready to reconcile txIds");
+    cout << "Returning from block::merge()!" << endl;
   }
 
   void MoneroTx::merge(const MoneroTx& tx) {