Skip to content

Commit dfa4772

Browse files
committed
merge bitcoin#24537: Split mempool RPCs from blockchain.cpp
1 parent 537d3b3 commit dfa4772

File tree

8 files changed

+513
-468
lines changed

8 files changed

+513
-468
lines changed

src/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ BITCOIN_CORE_H = \
300300
rpc/blockchain.h \
301301
rpc/client.h \
302302
rpc/index_util.h \
303+
rpc/mempool.h \
303304
rpc/mining.h \
304305
rpc/protocol.h \
305306
rpc/rawtransaction_util.h \
@@ -530,6 +531,7 @@ libbitcoin_server_a_SOURCES = \
530531
rpc/evo.cpp \
531532
rpc/index_util.cpp \
532533
rpc/masternode.cpp \
534+
rpc/mempool.cpp \
533535
rpc/governance.cpp \
534536
rpc/mining.cpp \
535537
rpc/misc.cpp \

src/bench/rpc_mempool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <bench/bench.h>
6-
#include <rpc/blockchain.h>
6+
#include <rpc/mempool.h>
77
#include <txmempool.h>
88

99
#include <univalue.h>

src/rest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <primitives/block.h>
2020
#include <primitives/transaction.h>
2121
#include <rpc/blockchain.h>
22+
#include <rpc/mempool.h>
2223
#include <rpc/protocol.h>
2324
#include <rpc/server.h>
2425
#include <rpc/server_util.h>

src/rpc/blockchain.cpp

Lines changed: 3 additions & 460 deletions
Large diffs are not rendered by default.

src/rpc/blockchain.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ extern RecursiveMutex cs_main;
1919
class CBlock;
2020
class CBlockIndex;
2121
class CChainState;
22-
class CTxMemPool;
2322
class UniValue;
2423
struct NodeContext;
2524
namespace llmq {
@@ -43,12 +42,6 @@ void RPCNotifyBlockChange(const CBlockIndex*);
4342
/** Block description to JSON */
4443
UniValue blockToJSON(BlockManager& blockman, const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, const llmq::CChainLocksHandler& clhandler, const llmq::CInstantSendManager& isman, bool txDetails = false) LOCKS_EXCLUDED(cs_main);
4544

46-
/** Mempool information to JSON */
47-
UniValue MempoolInfoToJSON(const CTxMemPool& pool, const llmq::CInstantSendManager& isman);
48-
49-
/** Mempool to JSON */
50-
UniValue MempoolToJSON(const CTxMemPool& pool, const llmq::CInstantSendManager* isman, bool verbose = false, bool include_mempool_sequence = false);
51-
5245
/** Block header to JSON */
5346
UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex, const llmq::CChainLocksHandler& clhandler) LOCKS_EXCLUDED(cs_main);
5447

0 commit comments

Comments
 (0)