Revert "Initialise walletdb system in a temp dir for all gtests"

This reverts commit 74372ea.
joyivan · Nov 3, 2016 · d873bd1 · d873bd1
1 parent 74372ea
commit d873bd1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/gtest/main.cpp b/src/gtest/main.cpp
@@ -1,24 +1,14 @@
 #include "gtest/gtest.h"
 #include "crypto/common.h"
-#include "wallet/db.h"
 
 #include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
 #include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
 
-#include <boost/filesystem.hpp>
-
 int main(int argc, char **argv) {
   assert(init_and_check_sodium() != -1);
   libsnark::default_r1cs_ppzksnark_pp::init_public_params();
   libsnark::inhibit_profiling_info = true;
   libsnark::inhibit_profiling_counters = true;
-
-  // Get temporary and unique path for walletdb.
-  // bitdb.Open() only intialises once, so this dir is used for all tests.
-  // Note: / operator to append paths
-  boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
-  boost::filesystem::create_directories(pathTemp);
-  bitdb.Open(pathTemp);
 
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

diff --git a/src/gtest/test_wallet_zkeys.cpp b/src/gtest/test_wallet_zkeys.cpp
@@ -5,6 +5,8 @@
 #include "wallet/walletdb.h"
 #include "util.h"
 
+#include <boost/filesystem.hpp>
+
 /**
  * This test covers methods on CWallet
  * GenerateNewZKey()
@@ -71,6 +73,12 @@ TEST(wallet_zkeys_tests, store_and_load_zkeys) {
 TEST(wallet_zkeys_tests, write_zkey_direct_to_db) {
     SelectParams(CBaseChainParams::TESTNET);
 
+    // Get temporary and unique path for file.
+    // Note: / operator to append paths
+    boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
+    boost::filesystem::create_directories(pathTemp);
+    mapArgs["-datadir"] = pathTemp.string();
+
     bool fFirstRun;
     CWallet wallet("wallet.dat");
     ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
@@ -140,6 +148,12 @@ TEST(wallet_zkeys_tests, write_cryptedzkey_direct_to_db) {
 
     SelectParams(CBaseChainParams::TESTNET);
 
+    // Get temporary and unique path for file.
+    // Note: / operator to append paths
+    boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
+    boost::filesystem::create_directories(pathTemp);
+    mapArgs["-datadir"] = pathTemp.string();
+
     bool fFirstRun;
     CWallet wallet("wallet_crypted.dat");
     ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));