sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix argument handling for devnets (#3549)

Browse Source 
* Use "devnet" instead of "dev" for network id

Otherwise one would have to use "dev.port=123" in configs, which might
be confusing as we usually name such networks "devnet".

* Fix ArgsManager::GetChainName to work with devnets again

-devnet is not a boolean arg, but a string. So we have to check for
existence only.
This commit is contained in:
Alexander Block 2020-06-24 10:03:53 +02:00
parent 5f9fc5edb6
commit 0b70380fff
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chainparams.cpp
View File

@ -616,7 +616,7 @@ public:
class CDevNetParams : public CChainParams {
public:
CDevNetParams() {
strNetworkID = "dev";
strNetworkID = "devnet";
consensus.nSubsidyHalvingInterval = 210240;
consensus.nMasternodePaymentsStartBlock = 4010; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock
consensus.nMasternodePaymentsIncreaseBlock = 4030;

2
src/chainparamsbase.cpp
View File

@ -13,7 +13,7 @@
const std::string CBaseChainParams::MAIN = "main";
const std::string CBaseChainParams::TESTNET = "test";
const std::string CBaseChainParams::DEVNET = "dev";
const std::string CBaseChainParams::DEVNET = "devnet";
const std::string CBaseChainParams::REGTEST = "regtest";
void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp)

2
src/qt/networkstyle.cpp
View File

@ -23,7 +23,7 @@ static const struct {
} network_styles[] = {
{"main", QAPP_APP_NAME_DEFAULT, 0, 0, ""},
{"test", QAPP_APP_NAME_TESTNET, 190, 20, QT_TRANSLATE_NOOP("SplashScreen", "[testnet]")},
{"dev", QAPP_APP_NAME_DEVNET, 190, 20, "[devnet: %s]"},
{"devnet", QAPP_APP_NAME_DEVNET, 190, 20, "[devnet: %s]"},
{"regtest", QAPP_APP_NAME_REGTEST, 160, 30, "[regtest]"}
};
static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles);

10
src/util.cpp
View File

@ -619,7 +619,7 @@ public:
/* Special test for -testnet and -regtest args, because we
* don't want to be confused by craziness like "[regtest] testnet=1"
*/
static inline bool GetNetBoolArg(const ArgsManager &am, const std::string& net_arg)
static inline bool GetNetBoolArg(const ArgsManager &am, const std::string& net_arg, bool interpret_bool)
{
std::pair<bool,std::string> found_result(false,std::string());
found_result = GetArgHelper(am.m_override_args, net_arg, true);
@ -629,7 +629,7 @@ public:
return false; // not set
}
}
return InterpretBool(found_result.second); // is set, so evaluate
return !interpret_bool || InterpretBool(found_result.second); // is set, so evaluate
}
};
@ -1030,9 +1030,9 @@ void ArgsManager::ReadConfigFile(const std::string& confPath)
std::string ArgsManager::GetChainName() const
{
bool fRegTest = ArgsManagerHelper::GetNetBoolArg(*this, "-regtest");
bool fDevNet = ArgsManagerHelper::GetNetBoolArg(*this, "-devnet");
bool fTestNet = ArgsManagerHelper::GetNetBoolArg(*this, "-testnet");
bool fRegTest = ArgsManagerHelper::GetNetBoolArg(*this, "-regtest", true);
bool fDevNet = ArgsManagerHelper::GetNetBoolArg(*this, "-devnet", false);
bool fTestNet = ArgsManagerHelper::GetNetBoolArg(*this, "-testnet", true);
int nameParamsCount = (fRegTest ? 1 : 0) + (fDevNet ? 1 : 0) + (fTestNet ? 1 : 0);
if (nameParamsCount > 1)