aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_basic/cryptonote_format_utils.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-04-03 22:19:57 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-04-03 22:19:57 +0100
commit5b63246813c88256e36f58480bf1a624cbbd4ec7 (patch)
tree26eea00e028f2f4b837b749e15a7c431e74c28b3 /src/cryptonote_basic/cryptonote_format_utils.cpp
parentMerge pull request #1930 (diff)
downloadmonero-5b63246813c88256e36f58480bf1a624cbbd4ec7.tar.xz
core: fix blob size cache, and reenable hash and blob size caches
Diffstat (limited to 'src/cryptonote_basic/cryptonote_format_utils.cpp')
-rw-r--r--src/cryptonote_basic/cryptonote_format_utils.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp
index edea8862f..745dfb72e 100644
--- a/src/cryptonote_basic/cryptonote_format_utils.cpp
+++ b/src/cryptonote_basic/cryptonote_format_utils.cpp
@@ -658,8 +658,6 @@ 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
@@ -690,7 +688,6 @@ 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)
@@ -736,8 +733,6 @@ 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
@@ -754,7 +749,6 @@ namespace cryptonote
b.hash = res;
b.set_hash_valid(true);
return true;
-#endif
}
//---------------------------------------------------------------
crypto::hash get_block_hash(const block& b)