From d979e6e36ac6be0d40b2a6bb70c668f9e6989ff9 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 3 Sep 2012 15:26:57 +0200
Subject: Use singleton block tree database instance

---
 src/test/test_bitcoin.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/test/test_bitcoin.cpp')

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index bcf090787..4580877cd 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -12,10 +12,15 @@ extern bool fPrintToConsole;
 extern void noui_connect();
 
 struct TestingSetup {
+    CCoinsViewDB *pcoinsdbview;
+
     TestingSetup() {
         fPrintToDebugger = true; // don't want to write to debug.log file
         noui_connect();
         bitdb.MakeMock();
+        pblocktree = new CBlockTreeDB("cr+");
+        pcoinsdbview = new CCoinsViewDB();
+        pcoinsTip = new CCoinsViewCache(*pcoinsdbview);
         LoadBlockIndex(true);
         bool fFirstRun;
         pwalletMain = new CWallet("wallet.dat");
@@ -26,6 +31,9 @@ struct TestingSetup {
     {
         delete pwalletMain;
         pwalletMain = NULL;
+        delete pcoinsTip;
+        delete pcoinsdbview;
+        delete pblocktree;
         bitdb.Flush(true);
     }
 };
-- 
cgit v1.2.3


From e1bfbab8029c33102889d7d970da5b6cc32ff75b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 4 Sep 2012 18:12:00 +0200
Subject: Add LevelDB MemEnv support

Support LevelDB memory-backed environments, and use them in unit tests.
---
 src/test/test_bitcoin.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/test/test_bitcoin.cpp')

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 4580877cd..0173c0064 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -2,6 +2,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include "db.h"
+#include "txdb.h"
 #include "main.h"
 #include "wallet.h"
 
@@ -18,8 +19,13 @@ struct TestingSetup {
         fPrintToDebugger = true; // don't want to write to debug.log file
         noui_connect();
         bitdb.MakeMock();
-        pblocktree = new CBlockTreeDB("cr+");
+#ifdef USE_LEVELDB
+        pblocktree = new CBlockTreeDB(true);
+        pcoinsdbview = new CCoinsViewDB(true);
+#else
+        pblocktree = new CBlockTreeDB();
         pcoinsdbview = new CCoinsViewDB();
+#endif
         pcoinsTip = new CCoinsViewCache(*pcoinsdbview);
         LoadBlockIndex(true);
         bool fFirstRun;
-- 
cgit v1.2.3


From 4ca60bba5c3b8394c252715c71e8758d63c316ee Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 16 Oct 2012 22:23:39 +0200
Subject: Remove BDB block database support

---
 src/test/test_bitcoin.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/test/test_bitcoin.cpp')

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 0173c0064..c1f47f786 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -19,13 +19,8 @@ struct TestingSetup {
         fPrintToDebugger = true; // don't want to write to debug.log file
         noui_connect();
         bitdb.MakeMock();
-#ifdef USE_LEVELDB
         pblocktree = new CBlockTreeDB(true);
         pcoinsdbview = new CCoinsViewDB(true);
-#else
-        pblocktree = new CBlockTreeDB();
-        pcoinsdbview = new CCoinsViewDB();
-#endif
         pcoinsTip = new CCoinsViewCache(*pcoinsdbview);
         LoadBlockIndex(true);
         bool fFirstRun;
-- 
cgit v1.2.3