From 3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3 Mon Sep 17 00:00:00 2001 From: jtimon Date: Mon, 1 Sep 2014 00:41:28 +0200 Subject: Remove CBaseChainParams::NetworkID() --- src/chainparams.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/chainparams.cpp') diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 179db5a818..f561877d9f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -240,10 +240,13 @@ void SelectParams(CBaseChainParams::Network network) { pCurrentParams = &Params(network); } -bool SelectParamsFromCommandLine() { - if (!SelectBaseParamsFromCommandLine()) +bool SelectParamsFromCommandLine() +{ + CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine(); + if (network == CBaseChainParams::MAX_NETWORK_TYPES) return false; - SelectParams(BaseParams().NetworkID()); + SelectBaseParams(network); + SelectParams(network); return true; } -- cgit v1.2.3 From b796cb084bd3865d094d86da2f33cd5c68294a43 Mon Sep 17 00:00:00 2001 From: jtimon Date: Thu, 9 Oct 2014 19:15:38 +0200 Subject: SQUASHME: NetworkIdFromCommandLine() function instead of method --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/chainparams.cpp') diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f561877d9f..ec05f592b9 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -242,7 +242,7 @@ void SelectParams(CBaseChainParams::Network network) { bool SelectParamsFromCommandLine() { - CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine(); + CBaseChainParams::Network network = NetworkIdFromCommandLine(); if (network == CBaseChainParams::MAX_NETWORK_TYPES) return false; -- cgit v1.2.3 From ca3ce0fa037a94f2c357ad04d42e5f526cbcb78e Mon Sep 17 00:00:00 2001 From: jtimon Date: Thu, 16 Oct 2014 22:49:33 +0200 Subject: squashme on 3fdb9e8c (Bluematt's bikeshedding) --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/chainparams.cpp') diff --git a/src/chainparams.cpp b/src/chainparams.cpp index ec05f592b9..3177266069 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -240,7 +240,7 @@ void SelectParams(CBaseChainParams::Network network) { pCurrentParams = &Params(network); } -bool SelectParamsFromCommandLine() +bool SelectParamsFromCommandLine() { CBaseChainParams::Network network = NetworkIdFromCommandLine(); if (network == CBaseChainParams::MAX_NETWORK_TYPES) -- cgit v1.2.3