Auto merge of #1506 - bitcartel:master_1478_fix_testnet3_test_issue, r=bitcartel
Stop some wallet tests creating ~/.zcash/testnet3 folder by setting -datadir environment Closes #1478
This commit is contained in:
commit
3fceaca3a1
|
@ -4,11 +4,12 @@ bin_PROGRAMS += zcash-gtest
|
||||||
# tool for generating our public parameters
|
# tool for generating our public parameters
|
||||||
zcash_gtest_SOURCES = \
|
zcash_gtest_SOURCES = \
|
||||||
gtest/main.cpp \
|
gtest/main.cpp \
|
||||||
|
gtest/test_checktransaction.cpp \
|
||||||
gtest/json_test_vectors.cpp \
|
gtest/json_test_vectors.cpp \
|
||||||
gtest/test_foundersreward.cpp \
|
gtest/test_foundersreward.cpp \
|
||||||
|
gtest/test_wallet_zkeys.cpp \
|
||||||
gtest/test_jsonspirit.cpp \
|
gtest/test_jsonspirit.cpp \
|
||||||
gtest/test_tautology.cpp \
|
gtest/test_tautology.cpp \
|
||||||
gtest/test_checktransaction.cpp \
|
|
||||||
gtest/test_equihash.cpp \
|
gtest/test_equihash.cpp \
|
||||||
gtest/test_joinsplit.cpp \
|
gtest/test_joinsplit.cpp \
|
||||||
gtest/test_keystore.cpp \
|
gtest/test_keystore.cpp \
|
||||||
|
@ -18,7 +19,6 @@ zcash_gtest_SOURCES = \
|
||||||
gtest/test_rpc.cpp \
|
gtest/test_rpc.cpp \
|
||||||
gtest/test_circuit.cpp \
|
gtest/test_circuit.cpp \
|
||||||
gtest/test_txid.cpp \
|
gtest/test_txid.cpp \
|
||||||
gtest/test_wallet_zkeys.cpp \
|
|
||||||
gtest/test_libzcash_utils.cpp \
|
gtest/test_libzcash_utils.cpp \
|
||||||
gtest/test_proofs.cpp \
|
gtest/test_proofs.cpp \
|
||||||
wallet/gtest/test_wallet.cpp
|
wallet/gtest/test_wallet.cpp
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
// To run tests:
|
// To run tests:
|
||||||
// ./zcash-gtest --gtest_filter="founders_reward_test.*"
|
// ./zcash-gtest --gtest_filter="founders_reward_test.*"
|
||||||
|
@ -25,13 +26,14 @@
|
||||||
TEST(founders_reward_test, create_testnet_2of3multisig) {
|
TEST(founders_reward_test, create_testnet_2of3multisig) {
|
||||||
ECC_Start();
|
ECC_Start();
|
||||||
SelectParams(CBaseChainParams::TESTNET);
|
SelectParams(CBaseChainParams::TESTNET);
|
||||||
boost::filesystem::path temp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
|
boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
|
||||||
const std::string path = temp.native() + "-wallet.dat";
|
boost::filesystem::create_directories(pathTemp);
|
||||||
|
mapArgs["-datadir"] = pathTemp.string();
|
||||||
bool fFirstRun;
|
bool fFirstRun;
|
||||||
auto pWallet = std::make_shared<CWallet>(path);
|
auto pWallet = std::make_shared<CWallet>("wallet.dat");
|
||||||
ASSERT_EQ(DB_LOAD_OK, pWallet->LoadWallet(fFirstRun));
|
ASSERT_EQ(DB_LOAD_OK, pWallet->LoadWallet(fFirstRun));
|
||||||
pWallet->TopUpKeyPool();
|
pWallet->TopUpKeyPool();
|
||||||
std::cout << "Test wallet file path: " << path << std::endl;
|
std::cout << "Test wallet and logs saved in folder: " << pathTemp.native() << std::endl;
|
||||||
|
|
||||||
int numKeys = 48;
|
int numKeys = 48;
|
||||||
std::vector<CPubKey> pubkeys;
|
std::vector<CPubKey> pubkeys;
|
||||||
|
|
|
@ -75,12 +75,12 @@ TEST(wallet_zkeys_tests, write_zkey_direct_to_db) {
|
||||||
|
|
||||||
// Get temporary and unique path for file.
|
// Get temporary and unique path for file.
|
||||||
// Note: / operator to append paths
|
// Note: / operator to append paths
|
||||||
boost::filesystem::path temp = boost::filesystem::temp_directory_path() /
|
boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
|
||||||
boost::filesystem::unique_path();
|
boost::filesystem::create_directories(pathTemp);
|
||||||
const std::string path = temp.native();
|
mapArgs["-datadir"] = pathTemp.string();
|
||||||
|
|
||||||
bool fFirstRun;
|
bool fFirstRun;
|
||||||
CWallet wallet(path);
|
CWallet wallet("wallet.dat");
|
||||||
ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
|
ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
|
||||||
|
|
||||||
// No default CPubKey set
|
// No default CPubKey set
|
||||||
|
@ -103,7 +103,7 @@ TEST(wallet_zkeys_tests, write_zkey_direct_to_db) {
|
||||||
auto addr = sk.address();
|
auto addr = sk.address();
|
||||||
int64_t now = GetTime();
|
int64_t now = GetTime();
|
||||||
CKeyMetadata meta(now);
|
CKeyMetadata meta(now);
|
||||||
CWalletDB db(path);
|
CWalletDB db("wallet.dat");
|
||||||
db.WriteZKey(addr, sk, meta);
|
db.WriteZKey(addr, sk, meta);
|
||||||
|
|
||||||
// wallet should not be aware of key
|
// wallet should not be aware of key
|
||||||
|
@ -150,12 +150,12 @@ TEST(wallet_zkeys_tests, write_cryptedzkey_direct_to_db) {
|
||||||
|
|
||||||
// Get temporary and unique path for file.
|
// Get temporary and unique path for file.
|
||||||
// Note: / operator to append paths
|
// Note: / operator to append paths
|
||||||
boost::filesystem::path temp = boost::filesystem::temp_directory_path() /
|
boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
|
||||||
boost::filesystem::unique_path();
|
boost::filesystem::create_directories(pathTemp);
|
||||||
const std::string path = temp.native();
|
mapArgs["-datadir"] = pathTemp.string();
|
||||||
|
|
||||||
bool fFirstRun;
|
bool fFirstRun;
|
||||||
CWallet wallet(path);
|
CWallet wallet("wallet_crypted.dat");
|
||||||
ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
|
ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
|
||||||
|
|
||||||
// No default CPubKey set
|
// No default CPubKey set
|
||||||
|
@ -187,7 +187,7 @@ TEST(wallet_zkeys_tests, write_cryptedzkey_direct_to_db) {
|
||||||
auto paymentAddress2 = wallet.GenerateNewZKey();
|
auto paymentAddress2 = wallet.GenerateNewZKey();
|
||||||
|
|
||||||
// Create a new wallet from the existing wallet path
|
// Create a new wallet from the existing wallet path
|
||||||
CWallet wallet2(path);
|
CWallet wallet2("wallet_crypted.dat");
|
||||||
ASSERT_EQ(DB_LOAD_OK, wallet2.LoadWallet(fFirstRun));
|
ASSERT_EQ(DB_LOAD_OK, wallet2.LoadWallet(fFirstRun));
|
||||||
|
|
||||||
// Confirm it's not the same as the other wallet
|
// Confirm it's not the same as the other wallet
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <boost/format.hpp>
|
#include <boost/format.hpp>
|
||||||
|
#include <boost/filesystem.hpp>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace json_spirit;
|
using namespace json_spirit;
|
||||||
|
@ -1093,6 +1094,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_encrypted_wallet_zkeys)
|
||||||
SecureString strWalletPass;
|
SecureString strWalletPass;
|
||||||
strWalletPass.reserve(100);
|
strWalletPass.reserve(100);
|
||||||
strWalletPass = "hello";
|
strWalletPass = "hello";
|
||||||
|
|
||||||
|
boost::filesystem::current_path(GetArg("-datadir","/tmp/thisshouldnothappen"));
|
||||||
BOOST_CHECK(pwalletMain->EncryptWallet(strWalletPass));
|
BOOST_CHECK(pwalletMain->EncryptWallet(strWalletPass));
|
||||||
|
|
||||||
// Verify we can still list the keys imported
|
// Verify we can still list the keys imported
|
||||||
|
|
Loading…
Reference in New Issue