Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: Replace remaining literal BTC with CURRENCY_UNIT. #18341

Merged
merged 1 commit into from
Mar 16, 2020

Conversation

domob1812
Copy link
Contributor

This replaces one remaining instance of the literal "BTC" string with the CURRENCY_UNIT constant, as is done in most of the codebase already.

After this change, no instance of literal "BTC" remains anywhere in the RPC help texts.

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved
@maflcko maflcko changed the title Replace remaining literal BTC with CURRENCY_UNIT. doc: Replace remaining literal BTC with CURRENCY_UNIT. Mar 13, 2020
@maflcko
Copy link
Member

maflcko commented Mar 13, 2020

I think this is ready to merge if it compiles

@practicalswift
Copy link
Contributor

practicalswift commented Mar 13, 2020

Concept ACK

FWIW:

$ git grep BTC -- "*.cpp" "*.h" ":(exclude)src/qt/" ":(exclude)src/wallet/test/" ":(exclude)src/test/" | grep -vE ': *(//|\*)'
src/policy/feerate.cpp:const std::string CURRENCY_UNIT = "BTC";
src/validation.cpp:        LogPrint(BCLog::MEMPOOL, "replacing tx %s with %s for %s BTC additional fees, %d delta bytes\n",
src/wallet/rpcwallet.cpp:            "                         Must be at least 0.0001 BTC per kB higher than the current transaction fee rate.\n"},

@domob1812
Copy link
Contributor Author

Concept ACK

FWIW:

$ git grep BTC -- "*.cpp" "*.h" ":(exclude)src/qt/" ":(exclude)src/wallet/test/" ":(exclude)src/test/" | grep -vE ': *(//|\*) .*'
src/policy/feerate.cpp:const std::string CURRENCY_UNIT = "BTC";
src/validation.cpp:        LogPrint(BCLog::MEMPOOL, "replacing tx %s with %s for %s BTC additional fees, %d delta bytes\n",
src/wallet/rpcwallet.cpp:            "                         Must be at least 0.0001 BTC per kB higher than the current transaction fee rate.\n"},

Good catch (I was only targeting the RPC help texts so far, as that is what I worked on when I noticed this). I've updated the PR, replacing also the validation.cpp instance (and squashed the commits).

src/validation.cpp Outdated Show resolved Hide resolved
@hebasto
Copy link
Member

hebasto commented Mar 13, 2020

Concept ACK.

This replaces one remaining instance of the literal "BTC" string with
the CURRENCY_UNIT constant, as is done in most of the codebase already.

The other remaining instance (which is just part of a log message and thus
not really user-visible) is just removed.

After this change, no instance of literal "BTC" remains anywhere in the
non-Qt and non-test codebase.
@maflcko
Copy link
Member

maflcko commented Mar 14, 2020

ACK 7df0cf7

@laanwj
Copy link
Member

laanwj commented Mar 16, 2020

ACK 7df0cf7
Doesn't change any translation strings so can go into 0.20.0.

@laanwj laanwj merged commit 9ed429c into bitcoin:master Mar 16, 2020
@domob1812 domob1812 deleted the currency-unit branch March 16, 2020 14:16
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 16, 2020
…_UNIT.

7df0cf7 Replace remaining literals BTC with CURRENCY_UNIT (Daniel Kraft)

Pull request description:

  This replaces one remaining instance of the literal `"BTC"` string with the `CURRENCY_UNIT` constant, as is done in most of the codebase already.

  After this change, no instance of literal `"BTC"` remains anywhere in the RPC help texts.

ACKs for top commit:
  MarcoFalke:
    ACK 7df0cf7
  laanwj:
    ACK 7df0cf7

Tree-SHA512: 7f7d52b366e084c93a7d6a3c45b1bbfc4f4f50bca6956594077e6d46295977c8cc18499232878869869c73a8ab9a1c41245029ae7425a87cec2ccb0cb52eea13
MarkLTZ added a commit to litecoinz-core/litecoinz that referenced this pull request Apr 19, 2020
MarkLTZ added a commit to litecoinz-core/litecoinz that referenced this pull request Apr 19, 2020
sidhujag pushed a commit to syscoin-core/syscoin that referenced this pull request Nov 10, 2020
…_UNIT.

7df0cf7 Replace remaining literals BTC with CURRENCY_UNIT (Daniel Kraft)

Pull request description:

  This replaces one remaining instance of the literal `"BTC"` string with the `CURRENCY_UNIT` constant, as is done in most of the codebase already.

  After this change, no instance of literal `"BTC"` remains anywhere in the RPC help texts.

ACKs for top commit:
  MarcoFalke:
    ACK 7df0cf7
  laanwj:
    ACK 7df0cf7

Tree-SHA512: 7f7d52b366e084c93a7d6a3c45b1bbfc4f4f50bca6956594077e6d46295977c8cc18499232878869869c73a8ab9a1c41245029ae7425a87cec2ccb0cb52eea13
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants