Skip to content

Commit f129170

Browse files
committed
Merge bitcoin#17306: refactor: Use name constants in chainparams initialization
37b8475 Chainparams: Use name constants in chainparams initialization (Jorge Timón) Pull request description: I thought this wouldn't work for some reason, but it seems it does. Just a little bit more consistency. I'm still not able to use them in qt/networkstyle.cpp though, not sure why. ACKs for top commit: MarcoFalke: ACK 37b8475 laanwj: ACK 37b8475 hebasto: ACK 37b8475, I have reviewed the code and it looks OK, I agree it can be merged. fjahr: ACK 37b8475 Tree-SHA512: d9fa5df5650e10c645ac1f3afe831674a47f35d4a649e18a3d2aee1d04b08e6896aff6f1bbed0630d28775c51f989f9daaa9e405c9f3d7dca30e639a6f9008f0
2 parents 6daddc4 + 37b8475 commit f129170

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/chainparams.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static CBlock CreateGenesisBlock(uint32_t nTime, uint32_t nNonce, uint32_t nBits
6262
class CMainParams : public CChainParams {
6363
public:
6464
CMainParams() {
65-
strNetworkID = "main";
65+
strNetworkID = CBaseChainParams::MAIN;
6666
consensus.nSubsidyHalvingInterval = 210000;
6767
consensus.BIP16Exception = uint256S("0x00000000000002dc756eebf4f49723ed8d30cc28a5f108eb94b1ba88ac4f9c22");
6868
consensus.BIP34Height = 227931;
@@ -169,7 +169,7 @@ class CMainParams : public CChainParams {
169169
class CTestNetParams : public CChainParams {
170170
public:
171171
CTestNetParams() {
172-
strNetworkID = "test";
172+
strNetworkID = CBaseChainParams::TESTNET;
173173
consensus.nSubsidyHalvingInterval = 210000;
174174
consensus.BIP16Exception = uint256S("0x00000000dd30457c001f4095d208cc1296b0eed002427aa599874af7a432b105");
175175
consensus.BIP34Height = 21111;
@@ -254,7 +254,7 @@ class CTestNetParams : public CChainParams {
254254
class CRegTestParams : public CChainParams {
255255
public:
256256
explicit CRegTestParams(const ArgsManager& args) {
257-
strNetworkID = "regtest";
257+
strNetworkID = CBaseChainParams::REGTEST;
258258
consensus.nSubsidyHalvingInterval = 150;
259259
consensus.BIP16Exception = uint256();
260260
consensus.BIP34Height = 500; // BIP34 activated on regtest (Used in functional tests)

0 commit comments

Comments
 (0)