phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 20:32:35 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

[move-only] Rename versionbitsinfo to deploymentinfo

Browse source
This commit is contained in:
Anthony Towns 2021-03-11 12:17:22 +10:00
parent c64b2c6a0f
commit ea68b3a572
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -145,6 +145,7 @@ BITCOIN_CORE_H = \
core_memusage.h \ core_memusage.h \
cuckoocache.h \ cuckoocache.h \
dbwrapper.h \ dbwrapper.h \
deploymentinfo.h \
deploymentstatus.h \ deploymentstatus.h \
external_signer.h \ external_signer.h \
flatfile.h \ flatfile.h \
@ -273,7 +274,6 @@ BITCOIN_CORE_H = \
validation.h \ validation.h \
validationinterface.h \ validationinterface.h \
versionbits.h \ versionbits.h \
versionbitsinfo.h \
wallet/bdb.h \ wallet/bdb.h \
wallet/coincontrol.h \ wallet/coincontrol.h \
wallet/coinselection.h \ wallet/coinselection.h \
@ -542,6 +542,7 @@ libbitcoin_common_a_SOURCES = \
compressor.cpp \ compressor.cpp \
core_read.cpp \ core_read.cpp \
core_write.cpp \ core_write.cpp \
deploymentinfo.cpp \
external_signer.cpp \ external_signer.cpp \
init/common.cpp \ init/common.cpp \
key.cpp \ key.cpp \
@ -563,7 +564,6 @@ libbitcoin_common_a_SOURCES = \
script/sign.cpp \ script/sign.cpp \
script/signingprovider.cpp \ script/signingprovider.cpp \
script/standard.cpp \ script/standard.cpp \
versionbitsinfo.cpp \
warnings.cpp \ warnings.cpp \
$(BITCOIN_CORE_H) $(BITCOIN_CORE_H)

2
src/chainparams.cpp
View file

@ -7,9 +7,9 @@
#include <chainparamsseeds.h> #include <chainparamsseeds.h>
#include <consensus/merkle.h> #include <consensus/merkle.h>
#include <deploymentinfo.h>
#include <hash.h> // for signet block challenge hash #include <hash.h> // for signet block challenge hash
#include <util/system.h> #include <util/system.h>
#include <versionbitsinfo.h>
#include <assert.h> #include <assert.h>

2
src/consensus/params.h
View file

@ -26,7 +26,7 @@ enum DeploymentPos : uint16_t
{ {
DEPLOYMENT_TESTDUMMY, DEPLOYMENT_TESTDUMMY,
DEPLOYMENT_TAPROOT, // Deployment of Schnorr/Taproot (BIPs 340-342) DEPLOYMENT_TAPROOT, // Deployment of Schnorr/Taproot (BIPs 340-342)
// NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp // NOTE: Also add new deployments to VersionBitsDeploymentInfo in deploymentinfo.cpp
MAX_VERSION_BITS_DEPLOYMENTS MAX_VERSION_BITS_DEPLOYMENTS
}; };
constexpr bool ValidDeployment(DeploymentPos dep) { return DEPLOYMENT_TESTDUMMY <= dep && dep <= DEPLOYMENT_TAPROOT; } constexpr bool ValidDeployment(DeploymentPos dep) { return DEPLOYMENT_TESTDUMMY <= dep && dep <= DEPLOYMENT_TAPROOT; }

2
src/versionbitsinfo.cpp → src/deploymentinfo.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <versionbitsinfo.h> #include <deploymentinfo.h>
#include <consensus/params.h> #include <consensus/params.h>

6
src/versionbitsinfo.h → src/deploymentinfo.h
View file

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_VERSIONBITSINFO_H #ifndef BITCOIN_DEPLOYMENTINFO_H
#define BITCOIN_VERSIONBITSINFO_H #define BITCOIN_DEPLOYMENTINFO_H
struct VBDeploymentInfo { struct VBDeploymentInfo {
/** Deployment name */ /** Deployment name */
@ -14,4 +14,4 @@ struct VBDeploymentInfo {
extern const struct VBDeploymentInfo VersionBitsDeploymentInfo[]; extern const struct VBDeploymentInfo VersionBitsDeploymentInfo[];
#endif // BITCOIN_VERSIONBITSINFO_H #endif // BITCOIN_DEPLOYMENTINFO_H

2
src/rpc/mining.cpp
View file

@ -10,6 +10,7 @@
#include <consensus/params.h> #include <consensus/params.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <core_io.h> #include <core_io.h>
#include <deploymentinfo.h>
#include <deploymentstatus.h> #include <deploymentstatus.h>
#include <key_io.h> #include <key_io.h>
#include <miner.h> #include <miner.h>
@ -35,7 +36,6 @@
#include <util/translation.h> #include <util/translation.h>
#include <validation.h> #include <validation.h>
#include <validationinterface.h> #include <validationinterface.h>
#include <versionbitsinfo.h>
#include <warnings.h> #include <warnings.h>
#include <memory> #include <memory>