diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-06-11 15:10:18 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-06-11 15:36:48 +0100 |
| commit | 235df7f4848fb597739c50e3a31007ae77f008f1 (patch) | |
| tree | 4c441bb96f27a3fd7d148c0b854a7c1a72af906b /src/blockchain_db/lmdb | |
| parent | Merge pull request #2059 (diff) | |
| download | monero-235df7f4848fb597739c50e3a31007ae77f008f1.tar.xz | |
blockchain_db: add a txpool tx getter which returns existence
Avoids exception spam for the "nope, not found" case
Diffstat (limited to 'src/blockchain_db/lmdb')
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.cpp | 15 | ||||
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.h | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp index d7947c8d0..6bb96d1db 100644 --- a/src/blockchain_db/lmdb/db_lmdb.cpp +++ b/src/blockchain_db/lmdb/db_lmdb.cpp @@ -1576,7 +1576,7 @@ txpool_tx_meta_t BlockchainLMDB::get_txpool_tx_meta(const crypto::hash& txid) co return meta; } -cryptonote::blobdata BlockchainLMDB::get_txpool_tx_blob(const crypto::hash& txid) const +bool BlockchainLMDB::get_txpool_tx_blob(const crypto::hash& txid, cryptonote::blobdata &bd) const { LOG_PRINT_L3("BlockchainLMDB::" << __func__); check_open(); @@ -1587,12 +1587,21 @@ cryptonote::blobdata BlockchainLMDB::get_txpool_tx_blob(const crypto::hash& txid MDB_val k = {sizeof(txid), (void *)&txid}; MDB_val v; auto result = mdb_cursor_get(m_cur_txpool_blob, &k, &v, MDB_SET); + if (result == MDB_NOTFOUND) + return false; if (result != 0) - throw1(DB_ERROR(lmdb_error("Error finding txpool tx meta: ", result).c_str())); + throw1(DB_ERROR(lmdb_error("Error finding txpool tx blob: ", result).c_str())); - blobdata bd; bd.assign(reinterpret_cast<const char*>(v.mv_data), v.mv_size); TXN_POSTFIX_RDONLY(); + return true; +} + +cryptonote::blobdata BlockchainLMDB::get_txpool_tx_blob(const crypto::hash& txid) const +{ + cryptonote::blobdata bd; + if (!get_txpool_tx_blob(txid, bd)) + throw1(DB_ERROR("Tx not found in txpool: ")); return bd; } diff --git a/src/blockchain_db/lmdb/db_lmdb.h b/src/blockchain_db/lmdb/db_lmdb.h index 540fababb..14e5d34e2 100644 --- a/src/blockchain_db/lmdb/db_lmdb.h +++ b/src/blockchain_db/lmdb/db_lmdb.h @@ -245,6 +245,7 @@ public: virtual bool txpool_has_tx(const crypto::hash &txid) const; virtual void remove_txpool_tx(const crypto::hash& txid); virtual txpool_tx_meta_t get_txpool_tx_meta(const crypto::hash& txid) const; + virtual bool get_txpool_tx_blob(const crypto::hash& txid, cryptonote::blobdata &bd) const; virtual cryptonote::blobdata get_txpool_tx_blob(const crypto::hash& txid) const; virtual bool for_all_txpool_txes(std::function<bool(const crypto::hash&, const txpool_tx_meta_t&, const cryptonote::blobdata*)> f, bool include_blob = false) const; |