monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moar bug fixes, removed debug prints

Browse source
This commit is contained in:
Thomas Winget 2014-10-30 14:57:39 -04:00 committed by warptangent
parent 0915913111
commit 71b18d7166
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp
View file

@ -1541,7 +1541,6 @@ tx_out_index BlockchainLMDB::get_output_tx_and_index(const uint64_t& amount, con
size_t num_elems = 0; size_t num_elems = 0;
mdb_cursor_count(cur, &num_elems); mdb_cursor_count(cur, &num_elems);
LOG_PRINT_L0(__func__ << ": amount == " << amount << ", index == " << index << ", num_elem for amount == " << num_elems);
if (num_elems <= index) if (num_elems <= index)
{ {
LOG_PRINT_L1("Attempting to get an output index by amount and amount index, but output not found"); LOG_PRINT_L1("Attempting to get an output index by amount and amount index, but output not found");
@ -1594,8 +1593,6 @@ tx_out_index BlockchainLMDB::get_output_tx_and_index(const uint64_t& amount, con
txn.commit(); txn.commit();
LOG_PRINT_L0(__func__ << ": tx_hash == " << pod_to_hex(tx_hash) << " tx_index == " << *(uint64_t*)v.mv_data);
return tx_out_index(tx_hash, *(uint64_t *)v.mv_data); return tx_out_index(tx_hash, *(uint64_t *)v.mv_data);
} }

7
src/cryptonote_core/blockchain.cpp
View file

@ -623,11 +623,10 @@ difficulty_type Blockchain::get_difficulty_for_next_block()
size_t offset = h - std::min(h, static_cast<size_t>(DIFFICULTY_BLOCKS_COUNT)); size_t offset = h - std::min(h, static_cast<size_t>(DIFFICULTY_BLOCKS_COUNT));
// because BlockchainDB::height() returns the index of the top block, the if (offset == 0)
// first index we need to get needs to be one {
// higher than height() - DIFFICULTY_BLOCKS_COUNT. This also conveniently
// makes sure we don't use the genesis block.
++offset; ++offset;
}
for(; offset < h; offset++) for(; offset < h; offset++)
{ {