diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/chainparams.cpp | 2 | ||||
-rw-r--r-- | src/consensus/params.h | 2 | ||||
-rw-r--r-- | src/deploymentinfo.cpp (renamed from src/versionbitsinfo.cpp) | 2 | ||||
-rw-r--r-- | src/deploymentinfo.h (renamed from src/versionbitsinfo.h) | 6 | ||||
-rw-r--r-- | src/rpc/mining.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a8e1b7bc1e..37ba5ad75b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -145,6 +145,7 @@ BITCOIN_CORE_H = \ core_memusage.h \ cuckoocache.h \ dbwrapper.h \ + deploymentinfo.h \ deploymentstatus.h \ external_signer.h \ flatfile.h \ @@ -273,7 +274,6 @@ BITCOIN_CORE_H = \ validation.h \ validationinterface.h \ versionbits.h \ - versionbitsinfo.h \ wallet/bdb.h \ wallet/coincontrol.h \ wallet/coinselection.h \ @@ -542,6 +542,7 @@ libbitcoin_common_a_SOURCES = \ compressor.cpp \ core_read.cpp \ core_write.cpp \ + deploymentinfo.cpp \ external_signer.cpp \ init/common.cpp \ key.cpp \ @@ -563,7 +564,6 @@ libbitcoin_common_a_SOURCES = \ script/sign.cpp \ script/signingprovider.cpp \ script/standard.cpp \ - versionbitsinfo.cpp \ warnings.cpp \ $(BITCOIN_CORE_H) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index fdaadeed4a..58a27e053b 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -7,9 +7,9 @@ #include <chainparamsseeds.h> #include <consensus/merkle.h> +#include <deploymentinfo.h> #include <hash.h> // for signet block challenge hash #include <util/system.h> -#include <versionbitsinfo.h> #include <assert.h> diff --git a/src/consensus/params.h b/src/consensus/params.h index 7d5fe1a734..174f4677fa 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -26,7 +26,7 @@ enum DeploymentPos : uint16_t { DEPLOYMENT_TESTDUMMY, 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 }; constexpr bool ValidDeployment(DeploymentPos dep) { return DEPLOYMENT_TESTDUMMY <= dep && dep <= DEPLOYMENT_TAPROOT; } diff --git a/src/versionbitsinfo.cpp b/src/deploymentinfo.cpp index fa41bad46d..70d9961133 100644 --- a/src/versionbitsinfo.cpp +++ b/src/deploymentinfo.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <versionbitsinfo.h> +#include <deploymentinfo.h> #include <consensus/params.h> diff --git a/src/versionbitsinfo.h b/src/deploymentinfo.h index a7822bc747..4c68856eac 100644 --- a/src/versionbitsinfo.h +++ b/src/deploymentinfo.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_VERSIONBITSINFO_H -#define BITCOIN_VERSIONBITSINFO_H +#ifndef BITCOIN_DEPLOYMENTINFO_H +#define BITCOIN_DEPLOYMENTINFO_H struct VBDeploymentInfo { /** Deployment name */ @@ -14,4 +14,4 @@ struct VBDeploymentInfo { extern const struct VBDeploymentInfo VersionBitsDeploymentInfo[]; -#endif // BITCOIN_VERSIONBITSINFO_H +#endif // BITCOIN_DEPLOYMENTINFO_H diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index d6ca0959f2..04aa459e11 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -10,6 +10,7 @@ #include <consensus/params.h> #include <consensus/validation.h> #include <core_io.h> +#include <deploymentinfo.h> #include <deploymentstatus.h> #include <key_io.h> #include <miner.h> @@ -35,7 +36,6 @@ #include <util/translation.h> #include <validation.h> #include <validationinterface.h> -#include <versionbitsinfo.h> #include <warnings.h> #include <memory> |