diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-26 22:36:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-26 22:36:43 +0200 |
| commit | 5f17d79527e34b80e9c320b00d01fcd176b59793 (patch) | |
| tree | 9a9406daeb8b4bf2ad342b3e4faa6f26669e50fe | |
| parent | Merge pull request #1925 (diff) | |
| parent | core: disable tx/block hash cache (diff) | |
| download | monero-5f17d79527e34b80e9c320b00d01fcd176b59793.tar.xz | |
Merge pull request #1927
a96f9bae core: disable tx/block hash cache (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_basic/cryptonote_format_utils.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp index 745dfb72e..edea8862f 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.cpp +++ b/src/cryptonote_basic/cryptonote_format_utils.cpp @@ -658,6 +658,8 @@ namespace cryptonote //--------------------------------------------------------------- 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()) { #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK @@ -688,6 +690,7 @@ namespace cryptonote t.set_blob_size_valid(true); } return true; +#endif } //--------------------------------------------------------------- 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) { + return calculate_block_hash(b, res); +#if 0 if (b.is_hash_valid()) { #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK @@ -749,6 +754,7 @@ namespace cryptonote b.hash = res; b.set_hash_valid(true); return true; +#endif } //--------------------------------------------------------------- crypto::hash get_block_hash(const block& b) |