Skip to content
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

Merged
merged 1 commit into from Sep 13, 2018

Conversation

@jnewbery
Copy link
Member

@jnewbery jnewbery commented Sep 12, 2018

Adds a couple of redefinitions to dummywallet.cpp.

@jnewbery
Copy link
Member Author

@jnewbery jnewbery commented Sep 12, 2018

Builds on #14204. Review that first.

@laanwj
Copy link
Member

@laanwj laanwj commented Sep 12, 2018

utACK abdba5f59e348c7093bee2639ef6c2398e8d2f6c
(really closes #7965)

@@ -221,15 +219,15 @@ class NodeImpl : public Node
}
std::vector<std::unique_ptr<Wallet>> getWallets() override
{
#ifdef ENABLE_WALLET
if (!g_wallet_init_interface.HasWalletSupport()) {
throw std::logic_error("Node::getWallets() called in non-wallet build.");
Copy link
Contributor

@ryanofsky ryanofsky Sep 12, 2018

Can you drop g_wallet_init_interface references and throws in this file? They seem redundant if MakeWallet and GetWallets functions can throw now.

Copy link
Member Author

@jnewbery jnewbery Sep 12, 2018

Done!

@jnewbery jnewbery force-pushed the actually_remove_enabled_wallet branch from abdba5f to 3efef4b Sep 12, 2018
@jnewbery
Copy link
Member Author

@jnewbery jnewbery commented Sep 12, 2018

#14204 is merged. I've rebased on master and addresed @ryanofsky's feedback: #14208 (comment)

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Sep 12, 2018

utACK 3efef4b225308954b23a30c74d7781ba87a51b76

scravy
scravy approved these changes Sep 12, 2018
Copy link
Contributor

@scravy scravy left a comment

utACK 3efef4b225308954b23a30c74d7781ba87a51b76

Copy link
Contributor

@ryanofsky ryanofsky left a comment

utACK 3efef4b225308954b23a30c74d7781ba87a51b76


#include <atomic>
#include <boost/thread/thread.hpp>
#include <univalue.h>

class CWallet;
class Wallet;
Copy link
Contributor

@practicalswift practicalswift Sep 12, 2018

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]

Copy link
Member

@promag promag Sep 13, 2018

Yap, should be fixed.

Copy link
Member Author

@jnewbery jnewbery Sep 13, 2018

fixed

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Sep 13, 2018

Note to reviewers: This pull request conflicts with the following ones:
  • #10973 (Refactor: separate wallet from node by ryanofsky)

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.
@jnewbery jnewbery force-pushed the actually_remove_enabled_wallet branch from 3efef4b to e4ef4b4 Sep 13, 2018
@jnewbery
Copy link
Member Author

@jnewbery jnewbery commented Sep 13, 2018

I've addressed the comment in #14208 (comment) and force-pushed.

@promag
Copy link
Member

@promag promag commented Sep 13, 2018

utACK e4ef4b4.

@laanwj laanwj merged commit e4ef4b4 into bitcoin:master Sep 13, 2018
1 of 2 checks passed
laanwj added a commit that referenced this issue Sep 13, 2018
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
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Mar 20, 2020
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
ftrader added a commit to bitcoin-cash-node/bitcoin-cash-node that referenced this issue May 19, 2020
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
5tefan added a commit to 5tefan/dash that referenced this issue Aug 10, 2021
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
5tefan added a commit to 5tefan/dash that referenced this issue Aug 11, 2021
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
5tefan added a commit to 5tefan/dash that referenced this issue Aug 12, 2021
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
5tefan added a commit to 5tefan/dash that referenced this issue Aug 12, 2021
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
5tefan added a commit to 5tefan/dash that referenced this issue Aug 12, 2021
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>
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

9 participants