diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-17 21:41:29 +0200 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-17 21:47:33 +0200 |
| commit | 015717e2b873b7a2ce433bd3be2328a782aa5d91 (patch) | |
| tree | be829a66c5da3e56e0ed30a93a35efdcd5ec428f | |
| parent | 3b3c66f85959f3393a3a9e87a29004b526f91b93 (diff) | |
| parent | 241c4d047ee658a976625c39c6acd04dd7b071ef (diff) | |
| download | bitcoin-015717e2b873b7a2ce433bd3be2328a782aa5d91.tar.xz | |
Merge bitcoin/bitcoin#25299: doc: Correct comments re. units of constants
241c4d047ee658a976625c39c6acd04dd7b071ef doc: Correct comment describing value of MAX_FILE_SIZE_PSBT as in MiB (Ben Woosley)
64f81a38b9f0e09e353d058aa88eb681a181df37 doc: Correct nPruneTarget misidentifying units of variable (darosior)
Pull request description:
In https://github.com/bitcoin/bitcoin/pull/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 241c4d047ee658a976625c39c6acd04dd7b071ef
darosior:
ACK 241c4d047ee658a976625c39c6acd04dd7b071ef, with or without https://github.com/bitcoin/bitcoin/pull/25299#discussion_r892705277
Tree-SHA512: 96c03a35140e5c53759f387bd292a8f8f621ba74c3cf6621939fad40f48892d23141c747ad3ab4fd71108e3b737670175abc2eb3990a1bd1660366c55d61ddf8
| -rw-r--r-- | src/node/blockstorage.h | 2 | ||||
| -rw-r--r-- | src/psbt.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h index 2e52716649..e017f3f427 100644 --- a/src/node/blockstorage.h +++ b/src/node/blockstorage.h @@ -49,7 +49,7 @@ extern std::atomic_bool fReindex; /** Pruning-related variables and constants */ /** True if we're running in -prune mode. */ extern bool fPruneMode; -/** Number of MiB of block files that we're trying to stay below. */ +/** Number of bytes of block files that we're trying to stay below. */ extern uint64_t nPruneTarget; // Because validation code takes pointers to the map's CBlockIndex objects, if diff --git a/src/psbt.h b/src/psbt.h index 8fda889bb4..4a6d41076f 100644 --- a/src/psbt.h +++ b/src/psbt.h @@ -54,7 +54,7 @@ static constexpr uint8_t PSBT_SEPARATOR = 0x00; // BIP 174 does not specify a maximum file size, but we set a limit anyway // to prevent reading a stream indefinitely and running out of memory. -const std::streamsize MAX_FILE_SIZE_PSBT = 100000000; // 100 MiB +const std::streamsize MAX_FILE_SIZE_PSBT = 100000000; // 100 MB // PSBT version number static constexpr uint32_t PSBT_HIGHEST_VERSION = 0; |