From 74b5cbe708c939249627a05b95c3caba47806c41 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 8 Jul 2019 11:44:27 -0400 Subject: [PATCH] cleanup --- src/daemon/MoneroDaemonModel.cpp | 3 --- src/wallet/MoneroWalletModel.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/daemon/MoneroDaemonModel.cpp b/src/daemon/MoneroDaemonModel.cpp index f5b82b1..6cd757b 100644 --- a/src/daemon/MoneroDaemonModel.cpp +++ b/src/daemon/MoneroDaemonModel.cpp @@ -149,7 +149,6 @@ namespace monero { } void MoneroBlock::merge(const shared_ptr& self, const shared_ptr& other) { - cout << "MoneroBlock::merge()" << endl; if (this != self.get()) throw runtime_error("this != self"); if (self == other) return; @@ -224,9 +223,7 @@ namespace monero { } void MoneroTx::merge(const shared_ptr& self, const shared_ptr& other) { - cout << "MoneroTx::merge()" << endl; if (this != self.get()) throw runtime_error("this != self"); - cout << self << ", " << other << endl; if (self == other) return; // merge blocks if they're different which comes back to merging txs diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp index 8c5f089..465e58a 100644 --- a/src/wallet/MoneroWalletModel.cpp +++ b/src/wallet/MoneroWalletModel.cpp @@ -128,12 +128,10 @@ namespace monero { } void MoneroTxWallet::merge(const shared_ptr& self, const shared_ptr& other) { - cout << "MoneroTxWallet::merge(MoneroTxs)" << endl; merge(static_pointer_cast(self), static_pointer_cast(other)); } void MoneroTxWallet::merge(const shared_ptr& self, const shared_ptr& other) { - cout << "MoneroTxWallet::merge()" << endl; if (this != self.get()) throw runtime_error("this != self"); if (self == other) return;