Browse Source

Get rid of TestNet()

0.10
jtimon 11 years ago
parent
commit
a3d946ebdc
  1. 2
      src/bitcoin-cli.cpp
  2. 2
      src/bitcoind.cpp
  3. 5
      src/chainparams.h

2
src/bitcoin-cli.cpp

@ -33,7 +33,7 @@ static bool AppInitRPC(int argc, char* argv[]) @@ -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;

2
src/bitcoind.cpp

@ -77,7 +77,7 @@ bool AppInit(int argc, char* argv[]) @@ -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;

5
src/chainparams.h

@ -120,9 +120,4 @@ void SelectParams(CChainParams::Network network); @@ -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

Loading…
Cancel
Save