Skip to content

Commit

Permalink
interface_ui: move from node to common library
Browse files Browse the repository at this point in the history
Allows InitError and InitWarning to be used by other executables beside
bitcoind and bitcoin-node.
  • Loading branch information
ryanofsky authored and Sjors committed Jul 17, 2024
1 parent 5edcf66 commit 3ef5d90
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions contrib/devtools/check-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ declare -A SUPPRESS
# init.cpp file currently calls Berkeley DB sanity check function on startup, so
# there is an undocumented dependency of the node library on the wallet library.
SUPPRESS["libbitcoin_node_a-init.o libbitcoin_wallet_a-bdb.o _ZN6wallet27BerkeleyDatabaseSanityCheckEv"]=1
# init/common.cpp file calls InitError and InitWarning from interface_ui which
# is currently part of the node library. interface_ui should just be part of the
# common library instead, and is moved in
# https://github.com/bitcoin/bitcoin/issues/10102
SUPPRESS["libbitcoin_common_a-common.o libbitcoin_node_a-interface_ui.o _Z11InitWarningRK13bilingual_str"]=1
SUPPRESS["libbitcoin_common_a-common.o libbitcoin_node_a-interface_ui.o _Z9InitErrorRK13bilingual_str"]=1
# rpc/external_signer.cpp adds defines node RPC methods but is built as part of the
# common library. It should be moved to the node library instead.
SUPPRESS["libbitcoin_common_a-external_signer.o libbitcoin_node_a-server.o _ZN9CRPCTable13appendCommandERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPK11CRPCCommand"]=1
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ libbitcoin_node_a_SOURCES = \
node/context.cpp \
node/database_args.cpp \
node/eviction.cpp \
node/interface_ui.cpp \
node/interfaces.cpp \
node/kernel_notifications.cpp \
node/mempool_args.cpp \
Expand Down Expand Up @@ -714,6 +713,7 @@ libbitcoin_common_a_SOURCES = \
netaddress.cpp \
netbase.cpp \
net_permissions.cpp \
node/interface_ui.cpp \
outputtype.cpp \
policy/feerate.cpp \
policy/policy.cpp \
Expand Down

0 comments on commit 3ef5d90

Please sign in to comment.