aboutsummaryrefslogtreecommitdiff
path: root/src/util.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2013-06-22 06:56:14 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2013-06-22 06:56:14 -0700
commit01b45731b75a19ac194b4206b20716bfedcb2357 (patch)
tree90bd76e552d0ac7b44382885e212d9705fe24d96 /src/util.cpp
parent905738a15aa68c39e32bc5b9bbde53a9610dc818 (diff)
parent0e4b31755534fac4ea6c20a60f719e3694252220 (diff)
Merge pull request #2632 from mikehearn/chainparams
Refactor chain-specific tweaks into a CChainParams class and introduce a regtest mode
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp
index f4892a2387..bfb6d75838 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -13,6 +13,7 @@
#include <sys/resource.h>
#endif
+#include "chainparams.h"
#include "util.h"
#include "sync.h"
#include "version.h"
@@ -78,7 +79,6 @@ bool fDaemon = false;
bool fServer = false;
bool fCommandLine = false;
string strMiscWarning;
-bool fTestNet = false;
bool fNoListen = false;
bool fLogTimestamps = false;
CMedianFilter<int64> vTimeOffsets(200,0);
@@ -1068,8 +1068,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
} else {
path = GetDefaultDataDir();
}
- if (fNetSpecific && GetBoolArg("-testnet", false))
- path /= "testnet3";
+ if (fNetSpecific)
+ path /= Params().DataDir();
fs::create_directories(path);