Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1731 

a427235e core: add a missing newline on a string to be logged (moneromooo-monero)
b6a2230e unit_tests: fix minor blockchain_db regression (moneromooo-monero)
c488eca5 hardfork: tone down some logs (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-21 11:21:57 +02:00
parent 6994c85201 a427235e30
commit 565c99f670
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptonote_basic/hardfork.cpp
View File

@ -191,10 +191,10 @@ void HardFork::init()
} }
catch (...) { populate = true; } catch (...) { populate = true; }
if (populate) { if (populate) {
LOG_PRINT_L0("The DB has no hard fork info, reparsing from start"); MINFO("The DB has no hard fork info, reparsing from start");
height = 1; height = 1;
} }
LOG_PRINT_L1("reorganizing from " << height); MDEBUG("reorganizing from " << height);
if (populate) { if (populate) {
reorganize_from_chain_height(height); reorganize_from_chain_height(height);
// reorg will not touch the genesis block, use this as a flag for populating done // reorg will not touch the genesis block, use this as a flag for populating done
@ -203,7 +203,7 @@ void HardFork::init()
else { else {
rescan_from_chain_height(height); rescan_from_chain_height(height);
} }
LOG_PRINT_L1("reorganization done"); MDEBUG("reorganization done");
} }
uint8_t HardFork::get_block_version(uint64_t height) const uint8_t HardFork::get_block_version(uint64_t height) const

2
src/cryptonote_core/cryptonote_tx_utils.cpp
View File

@ -339,7 +339,7 @@ namespace cryptonote
crypto::generate_ring_signature(tx_prefix_hash, boost::get<txin_to_key>(tx.vin[i]).k_image, keys_ptrs, in_contexts[i].in_ephemeral.sec, src_entr.real_output, sigs.data()); crypto::generate_ring_signature(tx_prefix_hash, boost::get<txin_to_key>(tx.vin[i]).k_image, keys_ptrs, in_contexts[i].in_ephemeral.sec, src_entr.real_output, sigs.data());
ss_ring_s << "signatures:" << ENDL; ss_ring_s << "signatures:" << ENDL;
std::for_each(sigs.begin(), sigs.end(), [&](const crypto::signature& s){ss_ring_s << s << ENDL;}); std::for_each(sigs.begin(), sigs.end(), [&](const crypto::signature& s){ss_ring_s << s << ENDL;});
ss_ring_s << "prefix_hash:" << tx_prefix_hash << ENDL << "in_ephemeral_key: " << in_contexts[i].in_ephemeral.sec << ENDL << "real_output: " << src_entr.real_output; ss_ring_s << "prefix_hash:" << tx_prefix_hash << ENDL << "in_ephemeral_key: " << in_contexts[i].in_ephemeral.sec << ENDL << "real_output: " << src_entr.real_output << ENDL;
i++; i++;
} }

2
tests/unit_tests/blockchain_db.cpp
View File

@ -288,7 +288,7 @@ TYPED_TEST(BlockchainDBTest, AddBlock)
ASSERT_TRUE(compare_blocks(this->m_blocks[0], b)); ASSERT_TRUE(compare_blocks(this->m_blocks[0], b));
// assert that we can't add the same block twice // assert that we can't add the same block twice
ASSERT_THROW(this->m_db->add_block(this->m_blocks[0], t_sizes[0], t_diffs[0], t_coins[0], this->m_txs[0]), BLOCK_EXISTS); ASSERT_THROW(this->m_db->add_block(this->m_blocks[0], t_sizes[0], t_diffs[0], t_coins[0], this->m_txs[0]), TX_EXISTS);
for (auto& h : this->m_blocks[0].tx_hashes) for (auto& h : this->m_blocks[0].tx_hashes)
{ {