diff options
| author | Jorge Timón <[email protected]> | 2015-05-25 09:00:17 +0200 |
|---|---|---|
| committer | Jorge Timón <[email protected]> | 2015-10-20 14:28:43 +0200 |
| commit | 55a89751faaada5598771d10401030e9e86eecbd (patch) | |
| tree | 87607d31265c50db8955f805d280faeb8e82ab03 /src/bitcoind.cpp | |
| parent | Chainparams: Replace CBaseChainParams::Network enum with string constants (su... (diff) | |
| download | discoin-55a89751faaada5598771d10401030e9e86eecbd.tar.xz discoin-55a89751faaada5598771d10401030e9e86eecbd.zip | |
Chainparams: Translations: DRY: options and error strings
Also remove SelectBaseParamsFromCommandLine and SelectParamsFromCommandLine
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 39bb301f4..d8fa47347 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -102,8 +102,10 @@ bool AppInit(int argc, char* argv[]) return false; } // 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"); + try { + SelectParams(ChainNameFromCommandLine()); + } catch(std::exception &e) { + fprintf(stderr, "Error: %s\n", e.what()); return false; } |