aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjtimon <jtimon@monetize.io>2014-03-22 20:22:14 +0100
committerjtimon <jtimon@monetize.io>2014-06-04 13:29:36 +0200
commita3d946ebdc2eebef9ccdc2c883f8abfebcf0f653 (patch)
tree4fde1c8b1c9058ec0ffaf5bde472fff5fa1000e5 /src
parent6fc0fa63d9eb6bdfcdfd2fd9792d23059c763534 (diff)
Get rid of TestNet()
Diffstat (limited to 'src')
-rw-r--r--src/bitcoin-cli.cpp2
-rw-r--r--src/bitcoind.cpp2
-rw-r--r--src/chainparams.h5
3 files changed, 2 insertions, 7 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index ce9e7a4027..29efdfa821 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -33,7 +33,7 @@ static bool AppInitRPC(int argc, char* argv[])
fprintf(stderr,"Error reading configuration file: %s\n", e.what());
return false;
}
- // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause)
+ // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
if (!SelectParamsFromCommandLine()) {
fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n");
return false;
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 9b535c2e6b..704332c39b 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -77,7 +77,7 @@ bool AppInit(int argc, char* argv[])
fprintf(stderr,"Error reading configuration file: %s\n", e.what());
return false;
}
- // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause)
+ // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
if (!SelectParamsFromCommandLine()) {
fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n");
return false;
diff --git a/src/chainparams.h b/src/chainparams.h
index 3849d33aca..653ca20f01 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -120,9 +120,4 @@ void SelectParams(CChainParams::Network network);
*/
bool SelectParamsFromCommandLine();
-inline bool TestNet() {
- // Note: it's deliberate that this returns "false" for regression test mode.
- return Params().NetworkID() == CChainParams::TESTNET;
-}
-
#endif