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

scripted-diff: s/BIP9DeploymentInfo/VBDeploymentInfo/

Browse Source 
-BEGIN VERIFY SCRIPT-
sed -i 's/BIP9DeploymentInfo/VBDeploymentInfo/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-
This commit is contained in:
Jorge Timón 2017-05-26 02:26:52 +02:00
parent 29c07196d0
commit b463bc9215
No known key found for this signature in database
GPG Key ID: 8866C18EA1C944A2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rpc/mining.cpp
View File

@ -303,7 +303,7 @@ static UniValue BIP22ValidationResult(const CValidationState& state)
} }
std::string gbt_vb_name(const Consensus::DeploymentPos pos) { std::string gbt_vb_name(const Consensus::DeploymentPos pos) {
const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos]; const struct VBDeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
std::string s = vbinfo.name; std::string s = vbinfo.name;
if (!vbinfo.gbt_force) { if (!vbinfo.gbt_force) {
s.insert(s.begin(), '!'); s.insert(s.begin(), '!');
@ -515,7 +515,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
// TODO: Maybe recheck connections/IBD and (if something wrong) send an expires-immediately template to stop miners? // TODO: Maybe recheck connections/IBD and (if something wrong) send an expires-immediately template to stop miners?
} }
const struct BIP9DeploymentInfo& segwit_info = VersionBitsDeploymentInfo[Consensus::DEPLOYMENT_SEGWIT]; const struct VBDeploymentInfo& segwit_info = VersionBitsDeploymentInfo[Consensus::DEPLOYMENT_SEGWIT];
// If the caller is indicating segwit support, then allow CreateNewBlock() // If the caller is indicating segwit support, then allow CreateNewBlock()
// to select witness transactions, after segwit activates (otherwise // to select witness transactions, after segwit activates (otherwise
// don't). // don't).
@ -629,7 +629,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
// FALL THROUGH to get vbavailable set... // FALL THROUGH to get vbavailable set...
case THRESHOLD_STARTED: case THRESHOLD_STARTED:
{ {
const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos]; const struct VBDeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
vbavailable.push_back(Pair(gbt_vb_name(pos), consensusParams.vDeployments[pos].bit)); vbavailable.push_back(Pair(gbt_vb_name(pos), consensusParams.vDeployments[pos].bit));
if (setClientRules.find(vbinfo.name) == setClientRules.end()) { if (setClientRules.find(vbinfo.name) == setClientRules.end()) {
if (!vbinfo.gbt_force) { if (!vbinfo.gbt_force) {
@ -642,7 +642,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
case THRESHOLD_ACTIVE: case THRESHOLD_ACTIVE:
{ {
// Add to rules only // Add to rules only
const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos]; const struct VBDeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
aRules.push_back(gbt_vb_name(pos)); aRules.push_back(gbt_vb_name(pos));
if (setClientRules.find(vbinfo.name) == setClientRules.end()) { if (setClientRules.find(vbinfo.name) == setClientRules.end()) {
// Not supported by the client; make sure it's safe to proceed // Not supported by the client; make sure it's safe to proceed

2
src/versionbits.cpp
View File

@ -5,7 +5,7 @@
#include "versionbits.h" #include "versionbits.h"
#include "consensus/params.h" #include "consensus/params.h"
const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_BITS_DEPLOYMENTS] = { const struct VBDeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_BITS_DEPLOYMENTS] = {
{ {
/*.name =*/ "testdummy", /*.name =*/ "testdummy",
/*.gbt_force =*/ true, /*.gbt_force =*/ true,

4
src/versionbits.h
View File

@ -30,7 +30,7 @@ enum ThresholdState {
// will either be NULL or a block with (height + 1) % Period() == 0. // will either be NULL or a block with (height + 1) % Period() == 0.
typedef std::map<const CBlockIndex*, ThresholdState> ThresholdConditionCache; typedef std::map<const CBlockIndex*, ThresholdState> ThresholdConditionCache;
struct BIP9DeploymentInfo { struct VBDeploymentInfo {
/** Deployment name */ /** Deployment name */
const char *name; const char *name;
/** Whether GBT clients can safely ignore this rule in simplified usage */ /** Whether GBT clients can safely ignore this rule in simplified usage */
@ -45,7 +45,7 @@ struct BIP9Stats {
bool possible; bool possible;
}; };
extern const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[]; extern const struct VBDeploymentInfo VersionBitsDeploymentInfo[];
/** /**
* Abstract class that implements BIP9-style threshold logic, and caches results. * Abstract class that implements BIP9-style threshold logic, and caches results.