Skip to content

Commit 015717e

Browse files
committed
Merge bitcoin/bitcoin#25299: doc: Correct comments re. units of constants
241c4d0 doc: Correct comment describing value of MAX_FILE_SIZE_PSBT as in MiB (Ben Woosley) 64f81a3 doc: Correct nPruneTarget misidentifying units of variable (darosior) Pull request description: In bitcoin/bitcoin#15848, darosior fixed up a comment which mis-identified the units of a constant. Another comment misidentified a value as in MiB rather than MB. ACKs for top commit: laanwj: Code review ACK 241c4d0 darosior: ACK 241c4d0, with or without bitcoin/bitcoin#25299 (comment) Tree-SHA512: 96c03a35140e5c53759f387bd292a8f8f621ba74c3cf6621939fad40f48892d23141c747ad3ab4fd71108e3b737670175abc2eb3990a1bd1660366c55d61ddf8
2 parents 3b3c66f + 241c4d0 commit 015717e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/node/blockstorage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extern std::atomic_bool fReindex;
4949
/** Pruning-related variables and constants */
5050
/** True if we're running in -prune mode. */
5151
extern bool fPruneMode;
52-
/** Number of MiB of block files that we're trying to stay below. */
52+
/** Number of bytes of block files that we're trying to stay below. */
5353
extern uint64_t nPruneTarget;
5454

5555
// Because validation code takes pointers to the map's CBlockIndex objects, if

src/psbt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static constexpr uint8_t PSBT_SEPARATOR = 0x00;
5454

5555
// BIP 174 does not specify a maximum file size, but we set a limit anyway
5656
// to prevent reading a stream indefinitely and running out of memory.
57-
const std::streamsize MAX_FILE_SIZE_PSBT = 100000000; // 100 MiB
57+
const std::streamsize MAX_FILE_SIZE_PSBT = 100000000; // 100 MB
5858

5959
// PSBT version number
6060
static constexpr uint32_t PSBT_HIGHEST_VERSION = 0;

0 commit comments

Comments
 (0)