[Cleanup] Remove stale UNITTEST network

Fuzzbawls · Fuzzbawls · commit bf74c6f7c4e8 · 2020-02-11T02:20:16.000-08:00
This network is un-necessary as our unit test suite can simply be run
with MainNet's parameters, which is basically what we already do.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -509,52 +509,8 @@ class CRegTestParams : public CTestNetParams
 };
 static CRegTestParams regTestParams;
 
-/**
- * Unit test
- */
-class CUnitTestParams : public CMainParams, public CModifiableParams
-{
-public:
-    CUnitTestParams()
-    {
-        networkID = CBaseChainParams::UNITTEST;
-        strNetworkID = "unittest";
-        nDefaultPort = 51478;
-        vFixedSeeds.clear(); //! Unit test mode doesn't have any fixed seeds.
-        vSeeds.clear();      //! Unit test mode doesn't have any DNS seeds.
-
-        fMiningRequiresPeers = false;
-        fDefaultConsistencyChecks = true;
-        fAllowMinDifficultyBlocks = false;
-        fMineBlocksOnDemand = true;
-    }
-
-    const Checkpoints::CCheckpointData& Checkpoints() const
-    {
-        // UnitTest share the same checkpoints as MAIN
-        return data;
-    }
-
-    //! Published setters to allow changing values in unit test cases
-    virtual void setSubsidyHalvingInterval(int anSubsidyHalvingInterval) { nSubsidyHalvingInterval = anSubsidyHalvingInterval; }
-    virtual void setEnforceBlockUpgradeMajority(int anEnforceBlockUpgradeMajority) { nEnforceBlockUpgradeMajority = anEnforceBlockUpgradeMajority; }
-    virtual void setRejectBlockOutdatedMajority(int anRejectBlockOutdatedMajority) { nRejectBlockOutdatedMajority = anRejectBlockOutdatedMajority; }
-    virtual void setToCheckBlockUpgradeMajority(int anToCheckBlockUpgradeMajority) { nToCheckBlockUpgradeMajority = anToCheckBlockUpgradeMajority; }
-    virtual void setDefaultConsistencyChecks(bool afDefaultConsistencyChecks) { fDefaultConsistencyChecks = afDefaultConsistencyChecks; }
-    virtual void setAllowMinDifficultyBlocks(bool afAllowMinDifficultyBlocks) { fAllowMinDifficultyBlocks = afAllowMinDifficultyBlocks; }
-    virtual void setSkipProofOfWorkCheck(bool afSkipProofOfWorkCheck) { fSkipProofOfWorkCheck = afSkipProofOfWorkCheck; }
-};
-static CUnitTestParams unitTestParams;
-
 static CChainParams* pCurrentParams = 0;
 
-CModifiableParams* ModifiableParams()
-{
-    assert(pCurrentParams);
-    assert(pCurrentParams == &unitTestParams);
-    return (CModifiableParams*)&unitTestParams;
-}
-
 const CChainParams& Params()
 {
     assert(pCurrentParams);
@@ -570,8 +526,6 @@ CChainParams& Params(CBaseChainParams::Network network)
         return testNetParams;
     case CBaseChainParams::REGTEST:
         return regTestParams;
-    case CBaseChainParams::UNITTEST:
-        return unitTestParams;
     default:
         assert(false && "Unimplemented network");
         return mainParams;
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -254,26 +254,6 @@ class CChainParams
     CAmount nSupplyBeforeFakeSerial = 0;
 };
 
-/**
- * Modifiable parameters interface is used by test cases to adapt the parameters in order
- * to test specific features more easily. Test cases should always restore the previous
- * values after finalization.
- */
-
-class CModifiableParams
-{
-public:
-    //! Published setters to allow changing values in unit test cases
-    virtual void setSubsidyHalvingInterval(int anSubsidyHalvingInterval) = 0;
-    virtual void setEnforceBlockUpgradeMajority(int anEnforceBlockUpgradeMajority) = 0;
-    virtual void setRejectBlockOutdatedMajority(int anRejectBlockOutdatedMajority) = 0;
-    virtual void setToCheckBlockUpgradeMajority(int anToCheckBlockUpgradeMajority) = 0;
-    virtual void setDefaultConsistencyChecks(bool aDefaultConsistencyChecks) = 0;
-    virtual void setAllowMinDifficultyBlocks(bool aAllowMinDifficultyBlocks) = 0;
-    virtual void setSkipProofOfWorkCheck(bool aSkipProofOfWorkCheck) = 0;
-};
-
-
 /**
  * Return the currently selected parameters. This won't change after app startup
  * outside of the unit tests.
@@ -283,9 +263,6 @@ const CChainParams& Params();
 /** Return parameters for the given network. */
 CChainParams& Params(CBaseChainParams::Network network);
 
-/** Get modifiable network parameters (UNITTEST only) */
-CModifiableParams* ModifiableParams();
-
 /** Sets the params returned by Params() to those for the given network. */
 void SelectParams(CBaseChainParams::Network network);
 
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -56,20 +56,6 @@ class CBaseRegTestParams : public CBaseTestNetParams
 };
 static CBaseRegTestParams regTestParams;
 
-/*
- * Unit test
- */
-class CBaseUnitTestParams : public CBaseMainParams
-{
-public:
-    CBaseUnitTestParams()
-    {
-        networkID = CBaseChainParams::UNITTEST;
-        strDataDir = "unittest";
-    }
-};
-static CBaseUnitTestParams unitTestParams;
-
 static CBaseChainParams* pCurrentBaseParams = 0;
 
 const CBaseChainParams& BaseParams()
@@ -90,9 +76,6 @@ void SelectBaseParams(CBaseChainParams::Network network)
     case CBaseChainParams::REGTEST:
         pCurrentBaseParams = &regTestParams;
         break;
-    case CBaseChainParams::UNITTEST:
-        pCurrentBaseParams = &unitTestParams;
-        break;
     default:
         assert(false && "Unimplemented network");
         return;
diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h
@@ -20,7 +20,6 @@ class CBaseChainParams
         MAIN,
         TESTNET,
         REGTEST,
-        UNITTEST,
 
         MAX_NETWORK_TYPES
     };
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
@@ -124,6 +124,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
     std::vector<unsigned char> result;
     CBitcoinSecret secret;
     CBitcoinAddress addr;
+    SelectParams(CBaseChainParams::MAIN);
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
@@ -172,7 +173,6 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
             BOOST_CHECK_MESSAGE(!secret.IsValid(), "IsValid pubkey as privkey:" + strTest);
         }
     }
-    SelectParams(CBaseChainParams::UNITTEST);
 }
 
 // Goal: check that generated keys match test vectors
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)
     CTxDestination nodest = CNoDestination();
     BOOST_CHECK(!dummyAddr.Set(nodest));
 
-    SelectParams(CBaseChainParams::UNITTEST);
+    SelectParams(CBaseChainParams::MAIN);
 }
 
 // Goal: check that base58 parsing code is robust against a variety of corrupted data
diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -35,7 +35,7 @@ BasicTestingSetup::BasicTestingSetup()
         SetupEnvironment();
         fPrintToDebugLog = false; // don't want to write to debug.log file
         fCheckBlockIndex = true;
-        SelectParams(CBaseChainParams::UNITTEST);
+        SelectParams(CBaseChainParams::MAIN);
 }
 BasicTestingSetup::~BasicTestingSetup()
 {

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)`
`124`	`124`	`std::vector<unsigned char> result;`
`125`	`125`	`CBitcoinSecret secret;`
`126`	`126`	`CBitcoinAddress addr;`
	`127`	`+ SelectParams(CBaseChainParams::MAIN);`
`127`	`128`
`128`	`129`	`for (unsigned int idx = 0; idx < tests.size(); idx++) {`
`129`	`130`	`UniValue test = tests[idx];`
`@@ -172,7 +173,6 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)`
`172`	`173`	`BOOST_CHECK_MESSAGE(!secret.IsValid(), "IsValid pubkey as privkey:" + strTest);`
`173`	`174`	`}`
`174`	`175`	`}`
`175`		`- SelectParams(CBaseChainParams::UNITTEST);`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`// Goal: check that generated keys match test vectors`
`@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)`
`240`	`240`	`CTxDestination nodest = CNoDestination();`
`241`	`241`	`BOOST_CHECK(!dummyAddr.Set(nodest));`
`242`	`242`
`243`		`- SelectParams(CBaseChainParams::UNITTEST);`
	`243`	`+ SelectParams(CBaseChainParams::MAIN);`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`// Goal: check that base58 parsing code is robust against a variety of corrupted data`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ BasicTestingSetup::BasicTestingSetup()`
`35`	`35`	`SetupEnvironment();`
`36`	`36`	`fPrintToDebugLog = false; // don't want to write to debug.log file`
`37`	`37`	`fCheckBlockIndex = true;`
`38`		`- SelectParams(CBaseChainParams::UNITTEST);`
	`38`	`+ SelectParams(CBaseChainParams::MAIN);`
`39`	`39`	`}`
`40`	`40`	`BasicTestingSetup::~BasicTestingSetup()`
`41`	`41`	`{`