refactor: Use AbortError in FatalError #19295

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2006-refactorAbortError changing 3 files +3 −6

MarcoFalke commented at 2:53 PM on June 16, 2020: member

FatalError has been copied from AbortNode, so the two should use the same style to avoid confusion.

Follow-up to #18927
refactor: Use AbortError in FatalError
This is needed for consistency with AbortNode
fa02b47313
MarcoFalke added the label Refactoring on Jun 16, 2020
hebasto commented at 6:58 PM on June 16, 2020: member

Concept ACK.
in src/ui_interface.h:125 in fa02b47313
```
 121 | @@ -122,6 +122,7 @@ void InitWarning(const bilingual_str& str);
 122 |  
 123 |  /** Show error message **/
 124 |  bool InitError(const bilingual_str& str);
 125 | +constexpr auto AbortError = InitError;
```
hebasto commented at 6:38 AM on June 17, 2020:

Why is this header selected to host this expression?

MarcoFalke commented at 10:22 AM on June 17, 2020:

It should be in a header because it is used in two places. Any suggestions where to put it?

hebasto commented at 10:29 AM on June 17, 2020:

I meant "why in this header" rather "why in header" :) This header looks good to me. Another possible one is validation.h.

hebasto commented at 10:30 AM on June 17, 2020:

But your variant is better for a code reader, I think.
hebasto approved
hebasto commented at 6:38 AM on June 17, 2020: member
ACK fa02b473132932c200be1750d1a5b1de14ea2383, I have reviewed the code and it looks OK, I agree it can be merged.

Suggestions for followups:
- remove "debug.log" from the translated string
- replace "debug.log" with the actual log file name (-debuglogfile option)
MarcoFalke merged this on Jun 17, 2020
MarcoFalke closed this on Jun 17, 2020
MarcoFalke deleted the branch on Jun 17, 2020

Sjors commented at 4:14 PM on June 17, 2020: member

As @achow101 noticed on IRC, this PR appears to cause the following error on Ubuntu 20.04, but not on macOS. Apparently only with --enable-debug.

./configure --enable-debug --with-incompatible-bdb --enable-werror
make

/usr/bin/ld: bitcoin_wallet-bitcoin-wallet.o:(.data.rel.ro+0x8): undefined reference to `InitError(bilingual_str const&)'
/usr/bin/ld: libbitcoin_wallet_tool.a(libbitcoin_wallet_tool_a-wallettool.o):(.data.rel.ro+0x8): undefined reference to `InitError(bilingual_str const&)'
/usr/bin/ld: libbitcoin_wallet.a(libbitcoin_wallet_a-salvage.o):(.data.rel.ro+0x8): undefined reference to `InitError(bilingual_str const&)'
/usr/bin/ld: libbitcoin_wallet.a(libbitcoin_wallet_a-wallet.o):(.data.rel.ro+0x8): undefined reference to `InitError(bilingual_str const&)'
/usr/bin/ld: libbitcoin_wallet.a(libbitcoin_wallet_a-walletdb.o):(.data.rel.ro+0x8): undefined reference to `InitError(bilingual_str const&)'
/usr/bin/ld: libbitcoin_wallet.a(libbitcoin_wallet_a-wallet.o):(.data.rel.ro+0x8): more undefined references to `InitError(bilingual_str const&)' follow
collect2: error: ld returned 1 exit status

jonatack commented at 4:42 PM on June 17, 2020: member

I'm seeing the issue on Debian as well.

$ uname -a
Linux 4.19.0-9-amd64 [#1](/bitcoin-bitcoin/1/) SMP Debian 4.19.118-2+deb10u1 (2020-06-07) x86_64 GNU/Linux

hebasto commented at 4:49 PM on June 17, 2020: member

@achow101 @Sjors @jonatack Mind testing #19309?
MarcoFalke referenced this in commit f3d776b593 on Jun 19, 2020
Fabcien referenced this in commit 978bd5b488 on Dec 11, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#18927 Pass bilingual_str argument to AbortNode()#19309 refactor: Fix link error with --enable-debug