Skip to content

Conversation

@jnewbery
Copy link
Contributor

Adds a couple of redefinitions to dummywallet.cpp.

@jnewbery
Copy link
Contributor Author

Builds on #14204. Review that first.

@laanwj
Copy link
Member

laanwj commented Sep 12, 2018

utACK abdba5f59e348c7093bee2639ef6c2398e8d2f6c
(really closes #7965)

Copy link
Contributor

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@jnewbery jnewbery force-pushed the actually_remove_enabled_wallet branch from abdba5f to 3efef4b Compare September 12, 2018 16:45
@jnewbery
Copy link
Contributor Author

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

@maflcko
Copy link
Member

maflcko commented Sep 12, 2018

utACK 3efef4b225308954b23a30c74d7781ba87a51b76

Copy link
Contributor

@scravy scravy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 3efef4b225308954b23a30c74d7781ba87a51b76

Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 3efef4b225308954b23a30c74d7781ba87a51b76

Copy link
Contributor

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]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yap, should be fixed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@DrahtBot
Copy link
Contributor

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.
@jnewbery jnewbery force-pushed the actually_remove_enabled_wallet branch from 3efef4b to e4ef4b4 Compare September 13, 2018 13:37
@jnewbery
Copy link
Contributor Author

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

@promag
Copy link
Contributor

promag commented Sep 13, 2018

utACK e4ef4b4.

@laanwj laanwj merged commit e4ef4b4 into bitcoin:master Sep 13, 2018
laanwj added a commit that referenced this pull request 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 pull request 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 pushed a commit to bitcoin-cash-node/bitcoin-cash-node that referenced this pull request 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 pull request 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 pull request 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>
UdjinM6 added a commit to dashpay/dash that referenced this pull request Aug 13, 2021
@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

Development

Successfully merging this pull request may close these issues.

9 participants