highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-23 11:32:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

rest/rpc: Remove now-unused old Ensure functions

Browse Source 
The scripted-diff in the previous commit should have removed all calls
to functions like: Ensure(?!Any)\(const std::any& (context|ctx)\), so we
can remove them now.
This commit is contained in:
Carl Dong
2021-04-14 10:34:50 -04:00
parent 6fb65b49f4
commit 038854f31e
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpc/blockchain.cpp
View File

@@ -55,10 +55,6 @@ static Mutex cs_blockchange;
static std::condition_variable cond_blockchange;
static CUpdatedBlock latestblock GUARDED_BY(cs_blockchange);
NodeContext& EnsureNodeContext(const std::any& ctx) {
return EnsureAnyNodeContext(ctx);
}
NodeContext& EnsureAnyNodeContext(const std::any& context)
{
auto node_context = util::AnyPtr<NodeContext>(context);
@@ -68,10 +64,6 @@ NodeContext& EnsureAnyNodeContext(const std::any& context)
return *node_context;
}
CTxMemPool& EnsureMemPool(const std::any& ctx) {
return EnsureAnyMemPool(ctx);
}
CTxMemPool& EnsureMemPool(const NodeContext& node)
{
if (!node.mempool) {
@@ -85,10 +77,6 @@ CTxMemPool& EnsureAnyMemPool(const std::any& context)
return EnsureMemPool(EnsureAnyNodeContext(context));
}
ChainstateManager& EnsureChainman(const std::any& ctx) {
return EnsureAnyChainman(ctx);
}
ChainstateManager& EnsureChainman(const NodeContext& node)
{
if (!node.chainman) {
@@ -103,10 +91,6 @@ ChainstateManager& EnsureAnyChainman(const std::any& context)
return EnsureChainman(EnsureAnyNodeContext(context));
}
CBlockPolicyEstimator& EnsureFeeEstimator(const std::any& ctx) {
return EnsureAnyFeeEstimator(ctx);
}
CBlockPolicyEstimator& EnsureFeeEstimator(const NodeContext& node)
{
if (!node.fee_estimator) {

4
src/rpc/blockchain.h
View File

@@ -56,16 +56,12 @@ void CalculatePercentilesByWeight(CAmount result[NUM_GETBLOCKSTATS_PERCENTILES],
void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr);
NodeContext& EnsureNodeContext(const std::any& context);
NodeContext& EnsureAnyNodeContext(const std::any& context);
CTxMemPool& EnsureMemPool(const NodeContext& node);
CTxMemPool& EnsureMemPool(const std::any& context);
CTxMemPool& EnsureAnyMemPool(const std::any& context);
ChainstateManager& EnsureChainman(const NodeContext& node);
ChainstateManager& EnsureChainman(const std::any& context);
ChainstateManager& EnsureAnyChainman(const std::any& context);
CBlockPolicyEstimator& EnsureFeeEstimator(const NodeContext& node);
CBlockPolicyEstimator& EnsureFeeEstimator(const std::any& context);
CBlockPolicyEstimator& EnsureAnyFeeEstimator(const std::any& context);
/**