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

Remove ENABLE_WALLET from libbitcoin_server.a #14168

Merged
merged 2 commits into from Sep 11, 2018

Conversation

@jnewbery
Copy link
Member

@jnewbery jnewbery commented Sep 7, 2018

This removes the final instances of ENABLE_WALLET in libbitcoin_server and so completes #7965.

Removes the ifdef ENABLE_WALLET from init.cpp.
@jonasschnelli
Copy link
Member

@jonasschnelli jonasschnelli commented Sep 7, 2018

Strong Concept ACK

@jnewbery jnewbery force-pushed the remove_wallet_enabled branch from 0e7395d to 9a2b3d2 Sep 7, 2018
ghost
ghost approved these changes Sep 7, 2018
@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Sep 7, 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.

@laanwj
Copy link
Member

@laanwj laanwj commented Sep 8, 2018

Yayyyy, good to see this finally happen
utACK 9a2b3d2e9d5584adb19633485b5398accc3704b7

@donaloconnor
Copy link
Contributor

@donaloconnor donaloconnor commented Sep 9, 2018

utACK 9a2b3d2 - looks much cleaner 👍

@ken2812221
Copy link
Contributor

@ken2812221 ken2812221 commented Sep 9, 2018

utACK 9a2b3d2

@@ -19,6 +19,9 @@
class WalletInit : public WalletInitInterface {
public:

//! Is the wallet component enabled
bool IsWalletEnabled() const override {return true;}
Copy link
Member

@MarcoFalke MarcoFalke Sep 9, 2018

Should say IsWalletCompiled() or similar?

Copy link
Member

@promag promag Sep 9, 2018

My suggestion HasWalletSupport().

Copy link
Member Author

@jnewbery jnewbery Sep 10, 2018

Changed to HasWalletSupport()

@jnewbery jnewbery force-pushed the remove_wallet_enabled branch from 9a2b3d2 to 7d038dc Sep 10, 2018
@jnewbery
Copy link
Member Author

@jnewbery jnewbery commented Sep 10, 2018

Renamed function as suggested here: #14168 (comment)

@Empact
Copy link
Member

@Empact Empact commented Sep 11, 2018

utACK 7d038dc

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Sep 11, 2018

utACK 7d038dc

MarcoFalke added a commit to MarcoFalke/bitcoin-core that referenced this issue Sep 11, 2018
7d038dc [build] remove ENABLE_WALLET ifdef from httprpc.cpp (John Newbery)
3076556 [build] Move dummy wallet into its own .cpp file. (John Newbery)

Pull request description:

  This removes the final instances of ENABLE_WALLET in libbitcoin_server and so completes bitcoin#7965.

Tree-SHA512: a49128b7c17f4f69940d5843e6b785f08687efb377b5157d5b267d1205e596eb5c1966f1afb8ab36bcc2491c46252099e3e844c91f5623da8ded2e358d46338d
@MarcoFalke MarcoFalke merged commit 7d038dc into bitcoin:master Sep 11, 2018
1 of 2 checks passed
@jnewbery jnewbery deleted the remove_wallet_enabled branch Sep 11, 2018
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Jan 27, 2020
Summary:
Backport of core [[bitcoin/bitcoin#14168 | PR14168]].

Depends on D5054.

Test Plan:
  ninja all check
  make check

  cmake -GNinja .. -DBUILD_BITCOIN_WALLET=OFF
  ninja all check

  ../configure --disable-wallet
  make check

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5058
Munkybooty added a commit to Munkybooty/dash that referenced this issue Jul 7, 2021
7d038dc [build] remove ENABLE_WALLET ifdef from httprpc.cpp (John Newbery)
3076556 [build] Move dummy wallet into its own .cpp file. (John Newbery)

Pull request description:

  This removes the final instances of ENABLE_WALLET in libbitcoin_server and so completes bitcoin#7965.

Tree-SHA512: a49128b7c17f4f69940d5843e6b785f08687efb377b5157d5b267d1205e596eb5c1966f1afb8ab36bcc2491c46252099e3e844c91f5623da8ded2e358d46338d

# Conflicts:
#	src/init.cpp
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Aug 3, 2021
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Aug 3, 2021
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Aug 5, 2021
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Aug 5, 2021
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Aug 5, 2021
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Aug 6, 2021
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Aug 8, 2021
5tefan added a commit to 5tefan/dash that referenced this issue Aug 10, 2021
7d038dc [build] remove ENABLE_WALLET ifdef from httprpc.cpp (John Newbery)
3076556 [build] Move dummy wallet into its own .cpp file. (John Newbery)

Pull request description:

  This removes the final instances of ENABLE_WALLET in libbitcoin_server
and so completes bitcoin#7965.

Tree-SHA512: a49128b7c17f4f69940d5843e6b785f08687efb377b5157d5b267d1205e596eb5c1966f1afb8ab36bcc2491c46252099e3e844c91f5623da8ded2e358d46338d
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Aug 11, 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.
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

9 participants