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

Merge #18810: doc: update rest info on block size and json

Browse Source 
ff6549c3c8 fix: update rest info on block size and json (Chris Abrams)

Pull request description:

  Addressing the ambiguous block size text in rest docs: https://github.com/bitcoin/bitcoin/issues/18703

  Also makes sure to let developers know there is `.json` option for the rest output format.

ACKs for top commit:
  MarcoFalke:
    ACK ff6549c3c8
  promag:
    ACK ff6549c3c8.

Tree-SHA512: 9ef93c1432d650b1f9599778ba092c1ca5b084a537af257078e1c713c76c5d3a4cc4b1ede8a2489964be8ed0303ad8bea58c1cb4759bbb9b24dbdebfec8001d3
This commit is contained in:
Wladimir J. van der Laan
2020-04-30 11:44:59 +02:00
parent 35ef3c15ef ff6549c3c8
commit afed2e98b0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/REST-interface.md
View File

@@ -30,7 +30,7 @@ To query for a confirmed transaction, enable the transaction index via "txindex=
Given a block hash: returns a block, in binary, hex-encoded binary or JSON formats. Given a block hash: returns a block, in binary, hex-encoded binary or JSON formats.
Responds with 404 if the block doesn't exist. Responds with 404 if the block doesn't exist.
The HTTP request and response are both handled entirely in-memory, thus making maximum memory usage at least 2.66MB (1 MB max block, plus hex encoding) per request. The HTTP request and response are both handled entirely in-memory.
With the /notxdetails/ option JSON response will only contain the transaction hash instead of the complete transaction details. The option only affects the JSON response. With the /notxdetails/ option JSON response will only contain the transaction hash instead of the complete transaction details. The option only affects the JSON response.

2
src/rest.cpp
View File

@@ -206,7 +206,7 @@ static bool rest_headers(HTTPRequest* req,
return true; return true;
} }
default: { default: {
return RESTERR(req, HTTP_NOT_FOUND, "output format not found (available: .bin, .hex)"); return RESTERR(req, HTTP_NOT_FOUND, "output format not found (available: .bin, .hex, .json)");
} }
} }
} }