github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-18 23:58:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

returning from block.merge()

Browse Source
This commit is contained in:
woodser
2019-06-13 08:05:56 -04:00
parent 8cbd262ee4
commit 9b181df21c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/MoneroDaemon.cpp
+2 -2
View File
@@ -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) {