github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-20 16:48:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

testGetTxsWithPaymentIds() passing

Browse Source
This commit is contained in:
woodser
2019-06-30 12:22:26 -04:00
parent cbba28d250
commit 5e9d466522
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+10 -3
View File
@@ -971,6 +971,8 @@ namespace monero {
}
}
//cout << "7" << endl;
// get unconfirmed incoming transfers
if (isPool) {
wallet2->update_pool_state(); // TODO monero-core: this should be encapsulated in wallet when unconfirmed transfers requested
@@ -982,6 +984,8 @@ namespace monero {
}
}
//cout << "8" << endl;
// filter and return transfers
vector<shared_ptr<MoneroTransfer>> transfers;
for (map<string, shared_ptr<MoneroTxWallet>>::const_iterator txIter = txMap.begin(); txIter != txMap.end(); txIter++) {
@@ -1002,10 +1006,12 @@ namespace monero {
}
}
// remove unrequested txs
if (tx->outgoingTransfer == boost::none && tx->incomingTransfers.empty()) tx->block.get()->txs.erase(std::remove(tx->block.get()->txs.begin(), tx->block.get()->txs.end(), tx), tx->block.get()->txs.end()); // TODO, no way to use const_iterator?
// remove unrequested txs from block
if (tx->block != boost::none && tx->outgoingTransfer == boost::none && tx->incomingTransfers.empty()) {
tx->block.get()->txs.erase(std::remove(tx->block.get()->txs.begin(), tx->block.get()->txs.end(), tx), tx->block.get()->txs.end()); // TODO, no way to use const_iterator?
}
}
//cout << "7" << endl;
//cout << "9" << endl;
cout << "MoneroWallet.cpp getTransfers() returning " << transfers.size() << " transfers" << endl;
return transfers;
}
@@ -1154,6 +1160,7 @@ namespace monero {
outTransfer->amount = *txAmountsIter;
// init other known fields
tx->paymentId = request.paymentId;
tx->isConfirmed = false;
tx->isCoinbase = false;
tx->isFailed = false; // TODO: test and handle if true
src/wallet/MoneroWalletModel.cpp
+13 -10
View File
@@ -86,7 +86,7 @@ namespace monero {
if (isIncoming != boost::none) node.put("isIncoming", *isIncoming);
if (!txIds.empty()) node.add_child("txIds", MoneroUtils::toPropertyTree(txIds));
if (hasPaymentId != boost::none) node.put("hasPaymentId", *hasPaymentId);
if (!paymentIds.empty()) throw runtime_error("paymentIds not implemented");
if (!paymentIds.empty()) node.add_child("paymentIds", MoneroUtils::toPropertyTree(paymentIds));
if (minHeight != boost::none) node.put("minHeight", *minHeight);
if (maxHeight != boost::none) node.put("maxHeight", *maxHeight);
if (includeOutputs != boost::none) node.put("includeOutputs", *includeOutputs);
@@ -97,18 +97,18 @@ namespace monero {
bool MoneroTxRequest::meetsCriteria(MoneroTxWallet* tx) const {
if (tx == nullptr) return false;
//cout << "MoneroTxRequest::meetsCriteria()" << endl;
cout << "MoneroTxRequest::meetsCriteria()" << endl;
//cout << "Testing tx: " << tx->serialize() << endl;
//cout << "1" << endl;
// filter on tx
if (id != boost::none && *id != *tx->id) return false;
if (paymentId != boost::none && *paymentId != *tx->paymentId) return false;
if (isConfirmed != boost::none && *isConfirmed != *tx->isConfirmed) return false;
if (inTxPool != boost::none && *inTxPool != *tx->inTxPool) return false;
if (doNotRelay != boost::none && *doNotRelay != *tx->doNotRelay) return false;
if (isFailed != boost::none && *isFailed != *tx->isFailed) return false;
if (isCoinbase != boost::none && *isCoinbase != *tx->isCoinbase) return false;
if (id != boost::none && id != tx->id) return false;
if (paymentId != boost::none && paymentId != tx->paymentId) return false;
if (isConfirmed != boost::none && isConfirmed != tx->isConfirmed) return false;
if (inTxPool != boost::none && inTxPool != tx->inTxPool) return false;
if (doNotRelay != boost::none && doNotRelay != tx->doNotRelay) return false;
if (isFailed != boost::none && isFailed != tx->isFailed) return false;
if (isCoinbase != boost::none && isCoinbase != tx->isCoinbase) return false;
//cout << "2" << endl;
@@ -139,6 +139,9 @@ namespace monero {
// filter on incoming
if (isIncoming != boost::none) {
cout << "Is... incoming?" << endl;
cout << tx->getIsIncoming() << endl;
cout << isIncoming << endl;
if (isIncoming != tx->getIsIncoming()) return false;
}
@@ -154,7 +157,7 @@ namespace monero {
// filter on remaining fields
boost::optional<uint64_t> txHeight = tx->getHeight();
if (!txIds.empty() && find(txIds.begin(), txIds.end(), *tx->id) == txIds.end()) return false;
if (!paymentIds.empty() && find(paymentIds.begin(), paymentIds.end(), *tx->paymentId) == paymentIds.end()) return false;
if (!paymentIds.empty() && (tx->paymentId == boost::none || find(paymentIds.begin(), paymentIds.end(), *tx->paymentId) == paymentIds.end())) return false;
if (getHeight() != boost::none && (txHeight == boost::none || *txHeight != *getHeight())) return false;
if (minHeight != boost::none && (txHeight == boost::none || *txHeight < *minHeight)) return false;
if (maxHeight != boost::none && (txHeight == boost::none || *txHeight > *maxHeight)) return false;