diff options
| author | Howard Chu <hyc@symas.com> | 2017-03-03 16:12:31 +0000 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2017-03-03 16:52:45 +0000 |
| commit | eb62dcc871184a35f0b385e857ba45800592d4c6 (patch) | |
| tree | 7df46c322b5f5f0de30df1086890014638d7fa02 /src | |
| parent | Fix #1824 don't end batch that we didn't start (diff) | |
| download | monero-eb62dcc871184a35f0b385e857ba45800592d4c6.tar.xz | |
Remove redundant num_txs() method
Cleanup of bf1348b7e2b2c72a6d40b23567afaa46b53e6cb7
Diffstat (limited to 'src')
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.cpp | 21 | ||||
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.h | 1 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp index a590ca135..c7266f19e 100644 --- a/src/blockchain_db/lmdb/db_lmdb.cpp +++ b/src/blockchain_db/lmdb/db_lmdb.cpp @@ -749,7 +749,7 @@ uint64_t BlockchainLMDB::add_transaction_data(const crypto::hash& blk_hash, cons uint64_t m_height = height(); int result; - uint64_t tx_id = num_txs(); + uint64_t tx_id = get_tx_count(); CURSOR(txs) CURSOR(tx_indices) @@ -1741,20 +1741,6 @@ uint64_t BlockchainLMDB::height() const return db_stats.ms_entries; } -uint64_t BlockchainLMDB::num_txs() const -{ - LOG_PRINT_L3("BlockchainLMDB::" << __func__); - check_open(); - TXN_PREFIX_RDONLY(); - int result; - - // get current height - MDB_stat db_stats; - if ((result = mdb_stat(m_txn, m_txs, &db_stats))) - throw0(DB_ERROR(lmdb_error("Failed to query m_txs: ", result).c_str())); - return db_stats.ms_entries; -} - uint64_t BlockchainLMDB::num_outputs() const { LOG_PRINT_L3("BlockchainLMDB::" << __func__); @@ -1900,10 +1886,11 @@ uint64_t BlockchainLMDB::get_tx_count() const check_open(); TXN_PREFIX_RDONLY(); + int result; MDB_stat db_stats; - if (mdb_stat(m_txn, m_tx_indices, &db_stats)) - throw0(DB_ERROR("Failed to query m_tx_indices")); + if ((result = mdb_stat(m_txn, m_txs, &db_stats))) + throw0(DB_ERROR(lmdb_error("Failed to query m_txs: ", result).c_str())); TXN_POSTFIX_RDONLY(); diff --git a/src/blockchain_db/lmdb/db_lmdb.h b/src/blockchain_db/lmdb/db_lmdb.h index ade7b6a76..8a5677566 100644 --- a/src/blockchain_db/lmdb/db_lmdb.h +++ b/src/blockchain_db/lmdb/db_lmdb.h @@ -310,7 +310,6 @@ private: virtual void remove_spent_key(const crypto::key_image& k_image); - uint64_t num_txs() const; uint64_t num_outputs() const; // Hard fork |