Get rid of TestNet()

jtimon · jtimon · commit a3d946ebdc2e · 2014-06-04T13:29:36.000+02:00
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ static bool AppInitRPC(int argc, char* argv[])`
`33`	`33`	`fprintf(stderr,"Error reading configuration file: %s\n", e.what());`
`34`	`34`	`return false;`
`35`	`35`	`}`
`36`		`- // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause)`
	`36`	`+ // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)`
`37`	`37`	`if (!SelectParamsFromCommandLine()) {`
`38`	`38`	`fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n");`
`39`	`39`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ bool AppInit(int argc, char* argv[])`
`77`	`77`	`fprintf(stderr,"Error reading configuration file: %s\n", e.what());`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`		`- // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause)`
	`80`	`+ // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)`
`81`	`81`	`if (!SelectParamsFromCommandLine()) {`
`82`	`82`	`fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n");`
`83`	`83`	`return false;`