From 36d1ae7507d9bb2c8f46f66c69f4cc84c3e3154c Mon Sep 17 00:00:00 2001 From: woodser Date: Sat, 22 Jun 2019 14:04:20 -0400 Subject: [PATCH] remove couts --- src/daemon/MoneroDaemonModel.cpp | 17 ++++++++--------- src/wallet/MoneroWallet.cpp | 2 -- src/wallet/MoneroWalletModel.cpp | 1 - 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/daemon/MoneroDaemonModel.cpp b/src/daemon/MoneroDaemonModel.cpp index 60e7c29..eac374f 100644 --- a/src/daemon/MoneroDaemonModel.cpp +++ b/src/daemon/MoneroDaemonModel.cpp @@ -144,21 +144,21 @@ namespace monero { if (prunableHash != boost::none) node.put("prunableHash", *prunableHash); if (size != boost::none) node.put("size", *size); if (weight != boost::none) node.put("weight", *weight); - if (!vins.empty()) throw runtime_error("not implemented"); - if (!vouts.empty()) throw runtime_error("not implemented"); - if (!outputIndices.empty()) throw runtime_error("not implemented"); + if (!vins.empty()) throw runtime_error("vins not implemented"); + if (!vouts.empty()) throw runtime_error("vouts not implemented"); + if (!outputIndices.empty()) throw runtime_error("outputIndices not implemented"); if (metadata != boost::none) node.put("metadata", *metadata); - if (commonTxSets != boost::none) throw runtime_error("not implemented"); - if (!extra.empty()) throw runtime_error("not implemented"); - if (rctSignatures != boost::none) throw runtime_error("not implemented"); - if (rctSigPrunable != boost::none) throw runtime_error("not implemented"); + if (commonTxSets != boost::none) throw runtime_error("commonTxSets not implemented"); + if (!extra.empty()) throw runtime_error("extra not implemented"); + if (rctSignatures != boost::none) throw runtime_error("rctSignatures not implemented"); + if (rctSigPrunable != boost::none) throw runtime_error("rctSigPrunable not implemented"); if (isKeptByBlock != boost::none) node.put("isKeptByBlock", *isKeptByBlock); if (isFailed != boost::none) node.put("isFailed", *isFailed); if (lastFailedHeight != boost::none) node.put("lastFailedHeight", *lastFailedHeight); if (lastFailedId != boost::none) node.put("lastFailedId", *lastFailedId); if (maxUsedBlockHeight != boost::none) node.put("maxUsedBlockHeight", *maxUsedBlockHeight); if (maxUsedBlockId != boost::none) node.put("maxUsedBlockId", *maxUsedBlockId); - if (!signatures.empty()) throw runtime_error("not implemented"); + if (!signatures.empty()) throw runtime_error("signatures not implemented"); return node; } @@ -306,7 +306,6 @@ namespace monero { } void MoneroOutput::merge(const shared_ptr& self, const shared_ptr& other) { - cout << "MoneroOutput::merge()" << endl; if (this != self.get()) throw runtime_error("this != self"); if (self == other) return; if (keyImage == boost::none) keyImage = other->keyImage; diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp index 5ffa2ec..85ed81a 100644 --- a/src/wallet/MoneroWallet.cpp +++ b/src/wallet/MoneroWallet.cpp @@ -84,7 +84,6 @@ namespace monero { * @param skipIfAbsent specifies if the tx should not be added if it doesn't already exist */ void mergeTx(const shared_ptr& tx, map>& txMap, map>& blockMap, bool skipIfAbsent) { - cout << "MoneroWallet::mergeTx()" << endl; if (tx->id == boost::none) throw runtime_error("Tx id is not initialized"); // txMap[*tx->id] = tx; @@ -887,7 +886,6 @@ namespace monero { } shared_ptr MoneroWallet::buildTxWithVout(const tools::wallet2::transfer_details& td) const { - cout << "MoneroWallet::buildWithVout()" << endl; // construct block shared_ptr block = shared_ptr(new MoneroBlock()); diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp index e3c8a62..fe94b74 100644 --- a/src/wallet/MoneroWalletModel.cpp +++ b/src/wallet/MoneroWalletModel.cpp @@ -332,7 +332,6 @@ namespace monero { } bool MoneroOutputRequest::meetsCriteria(MoneroOutputWallet* output) const { - cout << "MoneroOutputRequest::meetsCriteria()" << endl; // filter on output if (accountIndex != boost::none && *accountIndex != *output->accountIndex) return false;