Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/

jtimon · jtimon · commit 6f2f639cdf12 · 2016-10-19T19:01:10.000+02:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -960,8 +960,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         ::minRelayTxFee = CFeeRate(n);
     }
 
-    fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard());
-    if (Params().RequireStandard() && !fRequireStandard)
+    fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());
+    if (chainparams.RequireStandard() && !fRequireStandard)
         return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString()));
     nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
 
@@ -996,7 +996,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     if (!mapMultiArgs["-bip9params"].empty()) {
         // Allow overriding BIP9 parameters for testing
-        if (!Params().MineBlocksOnDemand()) {
+        if (!chainparams.MineBlocksOnDemand()) {
             return InitError("BIP9 parameters may only be overridden on regtest.");
         }
         const vector<string>& deployments = mapMultiArgs["-bip9params"];
@@ -1447,7 +1447,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
-    if (Params().GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
+    if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
         // Only advertize witness capabilities if they have a reasonable start time.
         // This allows us to have the code merged without a defined softfork, by setting its
         // end time to 0.

Original file line number	Diff line number	Diff line change
`@@ -960,8 +960,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`960`	`960`	`::minRelayTxFee = CFeeRate(n);`
`961`	`961`	`}`
`962`	`962`
`963`		`- fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard());`
`964`		`- if (Params().RequireStandard() && !fRequireStandard)`
	`963`	`+ fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());`
	`964`	`+ if (chainparams.RequireStandard() && !fRequireStandard)`
`965`	`965`	`return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString()));`
`966`	`966`	`nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);`
`967`	`967`
`@@ -996,7 +996,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`996`	`996`
`997`	`997`	`if (!mapMultiArgs["-bip9params"].empty()) {`
`998`	`998`	`// Allow overriding BIP9 parameters for testing`
`999`		`- if (!Params().MineBlocksOnDemand()) {`
	`999`	`+ if (!chainparams.MineBlocksOnDemand()) {`
`1000`	`1000`	`return InitError("BIP9 parameters may only be overridden on regtest.");`
`1001`	`1001`	`}`
`1002`	`1002`	`const vector<string>& deployments = mapMultiArgs["-bip9params"];`
`@@ -1447,7 +1447,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`1447`	`1447`	`}`
`1448`	`1448`	`}`
`1449`	`1449`
`1450`		`- if (Params().GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {`
	`1450`	`+ if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {`
`1451`	`1451`	`// Only advertize witness capabilities if they have a reasonable start time.`
`1452`	`1452`	`// This allows us to have the code merged without a defined softfork, by setting its`
`1453`	`1453`	`// end time to 0.`