monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 12:39:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove redundant num_txs() method

Browse source 
Cleanup of bf1348b7e2
This commit is contained in:
Howard Chu 2017-03-03 16:12:31 +00:00
parent 296641e047
commit eb62dcc871
No known key found for this signature in database
GPG key ID: FD2A70B44AB11BA7
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/blockchain_db/lmdb/db_lmdb.cpp
View file

@ -749,7 +749,7 @@ uint64_t BlockchainLMDB::add_transaction_data(const crypto::hash& blk_hash, cons
uint64_t m_height = height(); uint64_t m_height = height();
int result; int result;
uint64_t tx_id = num_txs(); uint64_t tx_id = get_tx_count();
CURSOR(txs) CURSOR(txs)
CURSOR(tx_indices) CURSOR(tx_indices)
@ -1741,20 +1741,6 @@ uint64_t BlockchainLMDB::height() const
return db_stats.ms_entries; 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 uint64_t BlockchainLMDB::num_outputs() const
{ {
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
@ -1900,10 +1886,11 @@ uint64_t BlockchainLMDB::get_tx_count() const
check_open(); check_open();
TXN_PREFIX_RDONLY(); TXN_PREFIX_RDONLY();
int result;
MDB_stat db_stats; MDB_stat db_stats;
if (mdb_stat(m_txn, m_tx_indices, &db_stats)) if ((result = mdb_stat(m_txn, m_txs, &db_stats)))
throw0(DB_ERROR("Failed to query m_tx_indices")); throw0(DB_ERROR(lmdb_error("Failed to query m_txs: ", result).c_str()));
TXN_POSTFIX_RDONLY(); TXN_POSTFIX_RDONLY();

1
src/blockchain_db/lmdb/db_lmdb.h
View file

@ -310,7 +310,6 @@ private:
virtual void remove_spent_key(const crypto::key_image& k_image); virtual void remove_spent_key(const crypto::key_image& k_image);
uint64_t num_txs() const;
uint64_t num_outputs() const; uint64_t num_outputs() const;
// Hard fork // Hard fork