From 70e124cae3ec9c0fca7c1b75a414a18c8362ec9b Mon Sep 17 00:00:00 2001 From: woodser Date: Sun, 30 Jun 2019 13:15:11 -0400 Subject: [PATCH] remove debug couts --- src/wallet/MoneroWallet.cpp | 2 -- src/wallet/MoneroWalletModel.cpp | 28 +++++----------------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp index 1b8f4dd..8eea7e9 100644 --- a/src/wallet/MoneroWallet.cpp +++ b/src/wallet/MoneroWallet.cpp @@ -1131,11 +1131,9 @@ namespace monero { list txIds; list txBlobs; list txMetadatas; - cout << "Attempting to fill..." << endl; if (!fill_response(wallet2.get(), ptx_vector, getTxKeys, txKeys, txAmounts, txFees, multisigTxSet, unsignedTxSet, doNotRelay, txIds, getTxHex, txBlobs, getTxMetadata, txMetadatas, err)) { throw runtime_error("need to handle error filling response!"); } - cout << "Done filling!" << endl; // build sent txs from results vector> txs; diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp index c9d2b14..69f1d07 100644 --- a/src/wallet/MoneroWalletModel.cpp +++ b/src/wallet/MoneroWalletModel.cpp @@ -240,37 +240,19 @@ namespace monero { } bool MoneroTransferRequest::meetsCriteria(MoneroTransfer* transfer) const { - - cout << "MoneroTransferRequest::meetsCriteria()" << endl; + //cout << "MoneroTransferRequest::meetsCriteria()" << endl; if (transfer == nullptr) throw runtime_error("transfer is null"); // TODO: port to java/js - if (transfer->accountIndex == boost::none) throw runtime_error("why isn't account index initialized?"); if (txRequest != boost::none && (*txRequest)->transferRequest != boost::none) throw runtime_error("Transfer request's tx request cannot have a circular transfer request"); // TODO: could auto detect and handl this. port to java/js - cout << "1" << endl; + //cout << "1" << endl; // filter on common fields if (getIsIncoming() != boost::none && *getIsIncoming() != *transfer->getIsIncoming()) return false; - cout << "1.1" << endl; if (getIsOutgoing() != boost::none && getIsOutgoing() != transfer->getIsOutgoing()) return false; - cout << "1.2" << endl; if (amount != boost::none && *amount != *transfer->amount) return false; - cout << "1.3" << endl; - cout << "Here we go" << endl; - cout << accountIndex << endl; - if (transfer->accountIndex == boost::none) throw runtime_error("why isn't account index initialized?"); - else { - cout << "Transfer account index is not boost none" << endl; - cout << *transfer->accountIndex << endl; - } - if (accountIndex == boost::none) cout << "Account index is boost none!" << endl; - else cout << *accountIndex << endl; - cout << transfer->accountIndex << endl; - cout << "Done" << endl; - - if (accountIndex != boost::none && *accountIndex != *transfer->accountIndex) return false; - cout << "2" << endl; + //cout << "2" << endl; // filter on incoming fields MoneroIncomingTransfer* inTransfer = dynamic_cast(transfer); @@ -282,7 +264,7 @@ namespace monero { if (!subaddressIndices.empty() && find(subaddressIndices.begin(), subaddressIndices.end(), *inTransfer->subaddressIndex) == subaddressIndices.end()) return false; } - cout << "3" << endl; + //cout << "3" << endl; // filter on outgoing fields MoneroOutgoingTransfer* outTransfer = dynamic_cast(transfer); @@ -328,7 +310,7 @@ namespace monero { // if (this.getDestionations() != null && this.getDestionations() != transfer.getDestionations()) return false; } - cout << "4" << endl; + //cout << "4" << endl; // validate type if (inTransfer == nullptr && outTransfer == nullptr) throw runtime_error("Transfer must be MoneroIncomingTransfer or MoneroOutgoingTransfer");