From 038854f31e3511e8bb6e163305cab0a96783d25b Mon Sep 17 00:00:00 2001
From: Carl Dong <contact@carldong.me>
Date: Wed, 14 Apr 2021 10:34:50 -0400
Subject: rest/rpc: Remove now-unused old Ensure functions

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.
---
 src/rpc/blockchain.cpp | 16 ----------------
 src/rpc/blockchain.h   |  4 ----
 2 files changed, 20 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 9bf03f24b5..19df2d8031 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -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) {
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index 3ac15c869d..ffb6f03b47 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -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);
 
 /**
-- 
cgit v1.2.3