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

assert MoneroTransferFilter and MoneroTxFilter do not reference each

Browse Source 
other
This commit is contained in:
woodser
2019-06-20 22:33:01 -04:00
parent d07c9b5880
commit 490f916d5f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+3 -3
View File
@@ -551,9 +551,9 @@ namespace monero {
// print request
cout << "Fetching transfers with request: ";
if (request.txRequest == boost::none) cout << request.serialize() << endl;
else if ((*request.txRequest)->block == boost::none) cout << (*request.txRequest)->serialize() << endl;
else cout << (*(*request.txRequest)->block)->serialize() << endl;
if (request.txRequest == boost::none) cout << "[transferRequest] " << request.serialize() << endl;
else if ((*request.txRequest)->block == boost::none) cout << "[txRequest] " << (*request.txRequest)->serialize() << endl;
else cout << "[block] " << (*(*request.txRequest)->block)->serialize() << endl;
// normalize request
// TODO: this will modify original request, construct copy? add test
src/wallet/MoneroWalletModel.cpp
+4 -2
View File
@@ -148,10 +148,10 @@ namespace monero {
}
// filter on remaining fields
boost::optional<uint64_t> txHeight = tx->block == boost::none ? boost::none : (*tx->block)->height;
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 (getHeight() != boost::none && *txHeight != *getHeight()) 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;
@@ -238,6 +238,8 @@ namespace monero {
}
bool MoneroTransferRequest::meetsCriteria(MoneroTransfer* transfer) const {
if (transfer == nullptr) throw runtime_error("transfer is null"); // TODO: port to java/js
if (txRequest != boost::none && this == (*(*txRequest)->transferRequest).get()) throw runtime_error("MoneroTransferFilter and MoneroTxFilter must not reference each other"); // TODO: port to java/js
// filter on common fields
if (getIsIncoming() != boost::none && *getIsIncoming() != *transfer->getIsIncoming()) return false;