highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4804 from jtimon/chainparams3

Browse Source 
Remove CBaseChainParams::NetworkID()
This commit is contained in:
Wladimir J. van der Laan
2014-10-17 08:47:11 +02:00
parent c2fc9729d1 ca3ce0fa03
commit 494ff05a4c
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/chainparams.cpp
View File

@@ -354,10 +354,13 @@ void SelectParams(CBaseChainParams::Network network) {
pCurrentParams = &Params(network);
}
bool SelectParamsFromCommandLine() {
if (!SelectBaseParamsFromCommandLine())
bool SelectParamsFromCommandLine()
{
CBaseChainParams::Network network = NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;
SelectParams(BaseParams().NetworkID());
SelectBaseParams(network);
SelectParams(network);
return true;
}