Merge pull request #1927

a96f9bae core: disable tx/block hash cache (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-26 22:36:43 +02:00
commit 5f17d79527
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -658,6 +658,8 @@ namespace cryptonote
//--------------------------------------------------------------- //---------------------------------------------------------------
bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size) bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size)
{ {
return calculate_transaction_hash(t, res, blob_size);
#if 0
if (t.is_hash_valid()) if (t.is_hash_valid())
{ {
#ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK
@ -688,6 +690,7 @@ namespace cryptonote
t.set_blob_size_valid(true); t.set_blob_size_valid(true);
} }
return true; return true;
#endif
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t& blob_size) bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t& blob_size)
@ -733,6 +736,8 @@ namespace cryptonote
//--------------------------------------------------------------- //---------------------------------------------------------------
bool get_block_hash(const block& b, crypto::hash& res) bool get_block_hash(const block& b, crypto::hash& res)
{ {
return calculate_block_hash(b, res);
#if 0
if (b.is_hash_valid()) if (b.is_hash_valid())
{ {
#ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK
@ -749,6 +754,7 @@ namespace cryptonote
b.hash = res; b.hash = res;
b.set_hash_valid(true); b.set_hash_valid(true);
return true; return true;
#endif
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
crypto::hash get_block_hash(const block& b) crypto::hash get_block_hash(const block& b)