Skip to content

Commit 3685f23

Browse files
committed
interface_ui: move from node to common library
Allows InitError and InitWarning to be used by other executables beside bitcoind and bitcoin-node.
1 parent 1d24d38 commit 3685f23

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

contrib/devtools/check-deps.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ declare -A SUPPRESS
4949
# init.cpp file currently calls Berkeley DB sanity check function on startup, so
5050
# there is an undocumented dependency of the node library on the wallet library.
5151
SUPPRESS["libbitcoin_node_a-init.o libbitcoin_wallet_a-bdb.o _ZN6wallet27BerkeleyDatabaseSanityCheckEv"]=1
52-
# init/common.cpp file calls InitError and InitWarning from interface_ui which
53-
# is currently part of the node library. interface_ui should just be part of the
54-
# common library instead, and is moved in
55-
# https://github.com/bitcoin/bitcoin/issues/10102
56-
SUPPRESS["libbitcoin_common_a-common.o libbitcoin_node_a-interface_ui.o _Z11InitWarningRK13bilingual_str"]=1
57-
SUPPRESS["libbitcoin_common_a-common.o libbitcoin_node_a-interface_ui.o _Z9InitErrorRK13bilingual_str"]=1
5852
# rpc/external_signer.cpp adds defines node RPC methods but is built as part of the
5953
# common library. It should be moved to the node library instead.
6054
SUPPRESS["libbitcoin_common_a-external_signer.o libbitcoin_node_a-server.o _ZN9CRPCTable13appendCommandERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPK11CRPCCommand"]=1

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ libbitcoin_node_a_SOURCES = \
428428
node/context.cpp \
429429
node/database_args.cpp \
430430
node/eviction.cpp \
431-
node/interface_ui.cpp \
432431
node/interfaces.cpp \
433432
node/kernel_notifications.cpp \
434433
node/mempool_args.cpp \
@@ -704,6 +703,7 @@ libbitcoin_common_a_SOURCES = \
704703
netaddress.cpp \
705704
netbase.cpp \
706705
net_permissions.cpp \
706+
node/interface_ui.cpp \
707707
outputtype.cpp \
708708
policy/feerate.cpp \
709709
policy/policy.cpp \

0 commit comments

Comments
 (0)