aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-02-21 17:22:01 +0200
committerRiccardo Spagni <ric@spagni.net>2017-02-21 17:22:01 +0200
commitecbd3f0798352bdc7bc32351bcd171291236139b (patch)
treec0d02f67e7af956ebcbd7ce3b2389ad534dceaa2
parentMerge pull request #1757 (diff)
parentunit_tests: hardfork unit test now needs get_block_blob_from_height (diff)
downloadmonero-ecbd3f0798352bdc7bc32351bcd171291236139b.tar.xz
Merge pull request #1758
5664826a unit_tests: hardfork unit test now needs get_block_blob_from_height (moneromooo-monero)
-rw-r--r--tests/unit_tests/hardfork.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unit_tests/hardfork.cpp b/tests/unit_tests/hardfork.cpp
index acc78f015..94bbcc215 100644
--- a/tests/unit_tests/hardfork.cpp
+++ b/tests/unit_tests/hardfork.cpp
@@ -32,6 +32,7 @@
#include "gtest/gtest.h"
#include "blockchain_db/lmdb/db_lmdb.h"
+#include "cryptonote_basic/cryptonote_format_utils.h"
#include "cryptonote_basic/hardfork.h"
using namespace cryptonote;
@@ -59,7 +60,7 @@ public:
virtual void block_txn_abort() {}
virtual void drop_hard_fork_info() {}
virtual bool block_exists(const crypto::hash& h, uint64_t *height) const { return false; }
- virtual blobdata get_block_blob_from_height(const uint64_t& height) const { return blobdata(); }
+ virtual blobdata get_block_blob_from_height(const uint64_t& height) const { return cryptonote::t_serializable_object_to_blob(get_block_from_height(height)); }
virtual blobdata get_block_blob(const crypto::hash& h) const { return blobdata(); }
virtual bool get_tx_blob(const crypto::hash& h, cryptonote::blobdata &tx) const { return false; }
virtual uint64_t get_block_height(const crypto::hash& h) const { return 0; }