BlockchainDB unit tests, lmdb linker flag

Some BlockchainDB unit testing fleshed out (and working), rudimentary
linker flag for lmdb in CMakeLists, but should probably be done
"correctly" at some point (find it on whatever system you're building on
and all that jazz).

update for rebase (warptangent 2015-01-04)
  fix conflicts with upstream CMakeLists.txt files

  tests/CMakeLists.txt (remove edits from original commit)

2 files changed, 25 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c91caff6e..000a18df6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,9 @@ link_directories(${UNBOUND_LIBRARY_DIRS})
 # Final setup for rapidjson
 include_directories(external/rapidjson)
 
+# TODO: make this find lmdb similarly to how unbound and boost are handled
+set(LMDB_LIBRARIES "-llmdb")
+
 if(MSVC)
   add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /FIinline_c.h /D__SSE4_1__")
   # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Dinline=__inline")
diff --git a/tests/unit_tests/BlockchainDB.cpp b/tests/unit_tests/BlockchainDB.cpp
index ea2940f31..98cdfc526 100644
--- a/tests/unit_tests/BlockchainDB.cpp
+++ b/tests/unit_tests/BlockchainDB.cpp
@@ -34,7 +34,7 @@
 #include "gtest/gtest.h"
 
 #include "cryptonote_core/blockchain_db.h"
-#include "cryptonote_core/BlockchainDB_impl/lmdb.h"
+#include "cryptonote_core/BlockchainDB_impl/db_lmdb.h"
 #include "cryptonote_core/cryptonote_format_utils.h"
 
 using namespace cryptonote;
@@ -81,10 +81,19 @@ const std::vector<std::vector<std::string>> t_transactions =
 // from std::string, this might break.
 bool compare_blocks(const block& a, const block& b)
 {
-  auto ab = block_to_blob(a);
-  auto bb = block_to_blob(b);
+  auto hash_a = pod_to_hex(get_block_hash(a));
+  auto hash_b = pod_to_hex(get_block_hash(b));
 
-  return ab == bb;
+  return hash_a == hash_b;
+}
+
+void print_block(const block& blk, const std::string& prefix = "")
+{
+  std::cerr << prefix << ": " << std::endl
+            << "\thash - " << pod_to_hex(get_block_hash(blk)) << std::endl
+            << "\tparent - " << pod_to_hex(blk.prev_id) << std::endl
+            << "\ttimestamp - " << blk.timestamp << std::endl
+  ;
 }
 
 // if the return type (blobdata for now) of tx_to_blob ever changes
@@ -187,6 +196,9 @@ protected:
         std::cerr << "File created by test not to be removed (for safety): " << f << std::endl;
       }
     }
+
+    // remove directory if it still exists
+    boost::filesystem::remove(m_prefix);
   }
 
   void set_prefix(const std::string& prefix)
@@ -197,7 +209,7 @@ protected:
 
 using testing::Types;
 
-typedef Types<> implementations;
+typedef Types<BlockchainLMDB> implementations;
 
 TYPED_TEST_CASE(BlockchainDBTest, implementations);
 
@@ -225,7 +237,11 @@ TYPED_TEST(BlockchainDBTest, AddBlock)
 
   // adding a block with no parent in the blockchain should throw.
   // note: this shouldn't be possible, but is a good (and cheap) failsafe.
-  ASSERT_THROW(this->m_db->add_block(this->m_blocks[1], t_sizes[1], t_diffs[1], t_coins[1], this->m_txs[1]), BLOCK_PARENT_DNE);
+  //
+  // TODO: need at least one more block to make this reasonable, as the
+  // BlockchainDB implementation should not check for parent if
+  // no blocks have been added yet (because genesis has no parent).
+  //ASSERT_THROW(this->m_db->add_block(this->m_blocks[1], t_sizes[1], t_diffs[1], t_coins[1], this->m_txs[1]), BLOCK_PARENT_DNE);
 
   ASSERT_NO_THROW(this->m_db->add_block(this->m_blocks[0], t_sizes[0], t_diffs[0], t_coins[0], this->m_txs[0]));
   ASSERT_NO_THROW(this->m_db->add_block(this->m_blocks[1], t_sizes[1], t_diffs[1], t_coins[1], this->m_txs[1]));