diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-15 19:32:18 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-15 19:32:18 +0200 |
| commit | 97c11caf0795e5edafa39a167a96f41b2a4fc38c (patch) | |
| tree | 087221b619ee644eaece447b5c0d2bc97d35e3fc /src/cryptonote_core | |
| parent | Merge pull request #2640 (diff) | |
| parent | fix lightwallet and subaddresses conflict (diff) | |
| download | monero-97c11caf0795e5edafa39a167a96f41b2a4fc38c.tar.xz | |
Merge pull request #2656
3492de01 fix lightwallet and subaddresses conflict (Jaquee)
329f149e remove reference to cryptonote::null_hash (Jaquee)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index d91589765..933914363 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -3244,7 +3244,7 @@ leave: { auto hash = get_block_hash(bl); const auto &expected_hash = m_blocks_hash_check[m_db->height()]; - if (expected_hash != cryptonote::null_hash) + if (expected_hash != crypto::null_hash) { if (memcmp(&hash, &expected_hash, sizeof(hash)) != 0) { @@ -3807,7 +3807,7 @@ uint64_t Blockchain::prevalidate_block_hashes(uint64_t height, const std::list<c size_t end = n * HASH_OF_HASHES_STEP + HASH_OF_HASHES_STEP; for (size_t i = n * HASH_OF_HASHES_STEP; i < end; ++i) { - CHECK_AND_ASSERT_MES(m_blocks_hash_check[i] == cryptonote::null_hash || m_blocks_hash_check[i] == data[i - first_index * HASH_OF_HASHES_STEP], + CHECK_AND_ASSERT_MES(m_blocks_hash_check[i] == crypto::null_hash || m_blocks_hash_check[i] == data[i - first_index * HASH_OF_HASHES_STEP], 0, "Consistency failure in m_blocks_hash_check construction"); m_blocks_hash_check[i] = data[i - first_index * HASH_OF_HASHES_STEP]; } @@ -4345,7 +4345,7 @@ void Blockchain::load_compiled_in_block_hashes() p += sizeof(hash.data); m_blocks_hash_of_hashes.push_back(hash); } - m_blocks_hash_check.resize(m_blocks_hash_of_hashes.size() * HASH_OF_HASHES_STEP, cryptonote::null_hash); + m_blocks_hash_check.resize(m_blocks_hash_of_hashes.size() * HASH_OF_HASHES_STEP, crypto::null_hash); MINFO(nblocks << " block hashes loaded"); // FIXME: clear tx_pool because the process might have been |