From a180d0a6c687c48eb4865bae9fde40e62e16ac9b Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Tue, 14 Jun 2016 15:16:34 -0600 Subject: [PATCH] Rename to `fCoinbaseMustBeProtected`. --- src/chainparams.cpp | 4 ++-- src/consensus/params.h | 2 +- src/main.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index cb75808ff..68dbe994f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -31,7 +31,7 @@ class CMainParams : public CChainParams { public: CMainParams() { strNetworkID = "main"; - consensus.coinbaseMustBeProtected = true; + consensus.fCoinbaseMustBeProtected = true; consensus.nSubsidySlowStartInterval = 20000; consensus.nSubsidyHalvingInterval = 840000; consensus.nMajorityEnforceBlockUpgrade = 750; @@ -211,7 +211,7 @@ class CRegTestParams : public CTestNetParams { public: CRegTestParams() { strNetworkID = "regtest"; - consensus.coinbaseMustBeProtected = false; + consensus.fCoinbaseMustBeProtected = false; consensus.nSubsidySlowStartInterval = 0; consensus.nSubsidyHalvingInterval = 150; consensus.nMajorityEnforceBlockUpgrade = 750; diff --git a/src/consensus/params.h b/src/consensus/params.h index 8d2cb3af8..07e945256 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -15,7 +15,7 @@ namespace Consensus { struct Params { uint256 hashGenesisBlock; - bool coinbaseMustBeProtected; + bool fCoinbaseMustBeProtected; /** Needs to evenly divide MAX_SUBSIDY to avoid rounding errors. */ int nSubsidySlowStartInterval; diff --git a/src/main.cpp b/src/main.cpp index c6f310410..ebedca949 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1631,7 +1631,7 @@ bool NonContextualCheckInputs(const CTransaction& tx, CValidationState &state, c if (coins->IsCoinBase()) { // Ensure that coinbases cannot be spent to transparent outputs // Disabled on regtest - if (consensusParams.coinbaseMustBeProtected && !tx.vout.empty()) { + if (consensusParams.fCoinbaseMustBeProtected && !tx.vout.empty()) { return state.Invalid( error("CheckInputs(): tried to spend coinbase with transparent outputs"), REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs");