Make SetMiscWarning() accept bilingual_str argument #19233

pull hebasto wants to merge 3 commits into bitcoin:master from hebasto:200610-bi-warn changing 13 files +57 −45
  1. hebasto commented at 9:49 am on June 10, 2020: member

    This is one more step for consistent usage of bilingual_str.

    No new translation messages are defined.

  2. fanquake added the label Refactoring on Jun 10, 2020
  3. in src/warnings.cpp:15 in 45cb61a835 outdated
    12 
    13-static Mutex g_warnings_mutex;
    14-static std::string strMiscWarning GUARDED_BY(g_warnings_mutex);
    15+#include <vector>
    16+
    17+static Mutex g_warnings_mutex;;
    


    MarcoFalke commented at 10:01 am on June 10, 2020:
    0static Mutex g_warnings_mutex;
    

    hebasto commented at 10:14 am on June 10, 2020:
  4. hebasto force-pushed on Jun 10, 2020
  5. hebasto commented at 10:13 am on June 10, 2020: member

    Updated 45cb61a835711df350ebee6a8ebddb8dc23ab47d -> ddafc58af052741d916a242c4a7df16e468efbdd (pr19233.01 -> pr19233.02, diff):

  6. refactor: Make GetWarnings() bilingual_str aware internally 38e33aa481
  7. Make GetWarnings() return bilingual_str d1ae7c0355
  8. Make SetMiscWarning() accept bilingual_str argument d49612f98a
  9. in src/warnings.cpp:53 in ddafc58af0 outdated
    54 
    55     // Pre-release build warning
    56     if (!CLIENT_VERSION_IS_RELEASE) {
    57-        warnings_concise = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
    58-        warnings_verbose = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications").translated;
    59+        warnings_concise = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications.");
    


    MarcoFalke commented at 11:07 am on June 10, 2020:
    why change the translation?

    hebasto commented at 12:04 pm on June 10, 2020:
  10. hebasto force-pushed on Jun 10, 2020
  11. hebasto commented at 12:03 pm on June 10, 2020: member

    Updated ddafc58af052741d916a242c4a7df16e468efbdd -> d49612f98add29066817b7c808b76c2d728948e5 (pr19233.02 -> pr19233.03, diff):

    why change the translation?

  12. laanwj commented at 12:49 pm on June 10, 2020: member
    Code review ACK d49612f98add29066817b7c808b76c2d728948e5 I’m somewhat surprised that GetWarnings wasn’t one of the first things changed to this paradigm.
  13. DrahtBot commented at 1:39 pm on June 10, 2020: member

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #15936 (Unify bitcoin-qt and bitcoind persistent settings by ryanofsky)
    • #15861 (Restore warning for individual unknown version bits, as well as unknown version schemas by luke-jr)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  14. MarcoFalke commented at 1:50 pm on June 10, 2020: member

    tested with

    0LC_ALL=de_DE.UTF-8 QT_QPA_PLATFORM=minimal BITCOIND=bitcoin-qt ./test/functional/feature_versionbits_warning.py -l DEBUG --tracerpc
    

    failed with

    0<-25- [0.000599] {"blocks": 578, "currentblockweight": 4000, "currentblocktx": 0, "difficulty": "4.656542373906925E-10", "networkhashps": 12, "pooledtx": 0, "chain": "regtest", "warnings": "Warnung: Unbekannte neue Regeln aktiviert (Versionsbit 27)"}
    12020-06-10T13:49:59.737000Z TestFramework (ERROR): Assertion failed
    2Traceback (most recent call last):
    3  File "/home/marco/workspace/btc_bitcoin_core/test/functional/test_framework/test_framework.py", line 119, in main
    4    self.run_test()
    5  File "./test/functional/feature_versionbits_warning.py", line 98, in run_test
    6    assert WARN_UNKNOWN_RULES_ACTIVE in node.getmininginfo()["warnings"]
    7AssertionError
    

    ACK d49612f98add29066817b7c808b76c2d728948e5 🌂

    Signature:

     0-----BEGIN PGP SIGNED MESSAGE-----
     1Hash: SHA512
     2
     3ACK d49612f98add29066817b7c808b76c2d728948e5 🌂
     4-----BEGIN PGP SIGNATURE-----
     5
     6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
     7pUh4nwv+IFYF1/2XoeTK/sL9efCjqADnR3EFMgDVjfrQwcNWPDfxRE8H4iZ6cX2X
     8FDTGKNrtTKQmyRaPiYIfDIOkrbeJhOmySwwAw9Xu2VVqG5wzZ514aanawaUVUplg
     9CZc6yQ5If39j6uLGcdJqgeNd0rxfpsdMiLgPMvJ9Ypj3GN31AvGH1psPZcdUlCwV
    10uMzQJyrD9Be5OSwT3ysg6pvVEIDWzySzBSyvdECLkDtxeSFWoCYOwSp/42i2rQCt
    11GkxTwr1fvOAbUbiJSvd0FzgUNszb1wtKujAmDNZUmEjYNYWKAEQYwrgzxKEbuCaL
    12aONEn/UOm6nwpUm2D+h73zGPk9du1TU7iUbbN/iaJyJToq7i+ZElwaIQXzqXIgwx
    13TKt/5qq3UKvDOPNXDbrCBjxBUu66AvqktmfnUXUiL9wTSxClii1fHuOrATOnoMMt
    141FWTIylffIVsF10GHaUvUNVUN0WaMFxoRmAj6WJIML4cw/DGpgo3mFWIhPNu9s8a
    15CVh78fr0
    16=BUAL
    17-----END PGP SIGNATURE-----
    

    Timestamp of file with hash dc976d1ef749013b37bb9e53e592084eef4fed150188607acf86340ed873f7e0 -

  15. MarcoFalke merged this on Jun 10, 2020
  16. MarcoFalke closed this on Jun 10, 2020

  17. hebasto deleted the branch on Jun 10, 2020
  18. Fabcien referenced this in commit 1a0013532d on May 31, 2021
  19. DrahtBot locked this on Feb 15, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 09:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me