aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_bitcoin.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2016-02-27 06:11:04 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2016-02-27 06:11:37 +0000
commite5daa2e2aef61f0b9441d19f0b67015f426c6056 (patch)
tree90a095dcd23c8a74cb605f55e224a902cba75a06 /src/test/test_bitcoin.cpp
parent5c70a6d6d15cc301b76558f708948c375fe63ccb (diff)
parent317462123f8e41fd7dd967ab907e59ddffb19898 (diff)
downloadbitcoin-e5daa2e2aef61f0b9441d19f0b67015f426c6056.tar.xz
Merge branch 'master' into depends_curl
Diffstat (limited to 'src/test/test_bitcoin.cpp')
-rw-r--r--src/test/test_bitcoin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 2147dbb065..0416d0c926 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin Core developers
+// Copyright (c) 2011-2015 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -54,6 +54,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
const CChainParams& chainparams = Params();
#ifdef ENABLE_WALLET
bitdb.MakeMock();
+ walletRegisterRPCCommands();
#endif
ClearDatadirCache();
pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));