GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3515612e06 into merged_master (Bitcoin PR #15473)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-27 22:59:58 +00:00
commit eef55250a7
10 changed files with 85 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rest.cpp
View file

@ -300,7 +300,7 @@ static bool rest_mempool_info(HTTPRequest* req, const std::string& strURIPart)
switch (rf) {
case RetFormat::JSON: {
UniValue mempoolInfoObject = mempoolInfoToJSON();
UniValue mempoolInfoObject = MempoolInfoToJSON(::mempool);
std::string strJSON = mempoolInfoObject.write() + "\n";
req->WriteHeader("Content-Type", "application/json");
@ -322,7 +322,7 @@ static bool rest_mempool_contents(HTTPRequest* req, const std::string& strURIPar
switch (rf) {
case RetFormat::JSON: {
UniValue mempoolObject = mempoolToJSON(true);
UniValue mempoolObject = MempoolToJSON(::mempool, true);
std::string strJSON = mempoolObject.write() + "\n";
req->WriteHeader("Content-Type", "application/json");