-
Notifications
You must be signed in to change notification settings - Fork 38.7k
[build] Actually remove ENABLE_WALLET #14208
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
[build] Actually remove ENABLE_WALLET #14208
Conversation
|
Builds on #14204. Review that first. |
|
utACK abdba5f59e348c7093bee2639ef6c2398e8d2f6c |
src/interfaces/node.cpp
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you drop g_wallet_init_interface references and throws in this file? They seem redundant if MakeWallet and GetWallets functions can throw now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
abdba5f to
3efef4b
Compare
|
#14204 is merged. I've rebased on master and addresed @ryanofsky's feedback: #14208 (comment) |
|
utACK 3efef4b225308954b23a30c74d7781ba87a51b76 |
scravy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 3efef4b225308954b23a30c74d7781ba87a51b76
ryanofsky
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 3efef4b225308954b23a30c74d7781ba87a51b76
src/interfaces/node.cpp
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2018-09-12 23:23:50 clang-tidy(pr=14208): interfaces/node.cpp:41:7: warning: declaration 'Wallet' is never referenced, but a declaration with the same name found in another namespace 'interfaces' [bugprone-forward-declaration-namespace]
2018-09-12 23:23:50 clang-tidy(pr=14208): interfaces/node.cpp:41:7: warning: no definition found for 'Wallet', but a definition with the same name 'Wallet' found in another namespace 'interfaces' [bugprone-forward-declaration-namespace]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yap, should be fixed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
Note to reviewers: This pull request conflicts with the following ones:
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. |
Removes the final #ifdef ENABLE_WALLET from libbitcoin_server by calling g_wallet_init_interface.HasWalletSupport(), and redifining GetWallets() and MakeWallet() in dummywallet.cpp.
3efef4b to
e4ef4b4
Compare
|
I've addressed the comment in #14208 (comment) and force-pushed. |
|
utACK e4ef4b4. |
e4ef4b4 [build] remove #ifdef ENABLE_WALLET from interfaces/node (John Newbery) Pull request description: Adds a couple of redefinitions to dummywallet.cpp. Tree-SHA512: d226bcccc46d089eac88beb54c31f6f18817682994b371f9793a5d28bec5d60dbdffacc8fc281807e25cc7f89da23e1f8f36fd99d12f8a40f77a972840e8c1b4
Summary: e4ef4b459548b4032b9da03b3103525f935acb82 [build] remove #ifdef ENABLE_WALLET from interfaces/node (John Newbery) Pull request description: Adds a couple of redefinitions to dummywallet.cpp. Tree-SHA512: d226bcccc46d089eac88beb54c31f6f18817682994b371f9793a5d28bec5d60dbdffacc8fc281807e25cc7f89da23e1f8f36fd99d12f8a40f77a972840e8c1b4 Backport of Core [[bitcoin/bitcoin#14208 | PR14208]] Test Plan: cmake -GNinja -DBUILD_BITCOIN_WALLET=OFF .. ninja ninja check ninja check-functional ./bitcoind ./bitcoin-cli getnewaddress Verify rpc fails because there is no wallet. Reviewers: O1 Bitcoin ABC, #bitcoin_abc, deadalnix Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5518
Summary: e4ef4b459548b4032b9da03b3103525f935acb82 [build] remove #ifdef ENABLE_WALLET from interfaces/node (John Newbery) Pull request description: Adds a couple of redefinitions to dummywallet.cpp. Tree-SHA512: d226bcccc46d089eac88beb54c31f6f18817682994b371f9793a5d28bec5d60dbdffacc8fc281807e25cc7f89da23e1f8f36fd99d12f8a40f77a972840e8c1b4 Backport of Core [[bitcoin/bitcoin#14208 | PR14208]] Test Plan: cmake -GNinja -DBUILD_BITCOIN_WALLET=OFF .. ninja ninja check ninja check-functional ./bitcoind ./bitcoin-cli getnewaddress Verify rpc fails because there is no wallet. Reviewers: O1 Bitcoin ABC, #bitcoin_abc, deadalnix Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5518
e4ef4b4 [build] remove #ifdef ENABLE_WALLET from interfaces/node (John Newbery) Pull request description: Adds a couple of redefinitions to dummywallet.cpp. Tree-SHA512: d226bcccc46d089eac88beb54c31f6f18817682994b371f9793a5d28bec5d60dbdffacc8fc281807e25cc7f89da23e1f8f36fd99d12f8a40f77a972840e8c1b4
e4ef4b4 [build] remove #ifdef ENABLE_WALLET from interfaces/node (John Newbery) Pull request description: Adds a couple of redefinitions to dummywallet.cpp. Tree-SHA512: d226bcccc46d089eac88beb54c31f6f18817682994b371f9793a5d28bec5d60dbdffacc8fc281807e25cc7f89da23e1f8f36fd99d12f8a40f77a972840e8c1b4 Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
Adds a couple of redefinitions to dummywallet.cpp.