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

Projects
None yet
9 participants
@jnewbery
Copy link
Member

commented Sep 7, 2018

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

[build] Move dummy wallet into its own .cpp file.
Removes the ifdef ENABLE_WALLET from init.cpp.

@jnewbery jnewbery referenced this pull request Sep 7, 2018

Closed

Remaining instances of ENABLE_WALLET in `libbitcoin_server.a` #7965

14 of 14 tasks complete
@jonasschnelli

This comment has been minimized.

Copy link
Member

commented Sep 7, 2018

Strong Concept ACK

@jonasschnelli jonasschnelli added the Wallet label Sep 7, 2018

@jnewbery jnewbery force-pushed the jnewbery:remove_wallet_enabled branch Sep 7, 2018

@ghost

ghost approved these changes Sep 7, 2018

@DrahtBot

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Member

commented Sep 8, 2018

Yayyyy, good to see this finally happen
utACK 9a2b3d2e9d5584adb19633485b5398accc3704b7

@donaloconnor

This comment has been minimized.

Copy link
Contributor

commented Sep 9, 2018

utACK 9a2b3d2 - looks much cleaner 👍

@ken2812221

This comment has been minimized.

Copy link
Member

commented Sep 9, 2018

utACK 9a2b3d2

src/wallet/init.cpp Outdated
@@ -19,6 +19,9 @@
class WalletInit : public WalletInitInterface {
public:

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

This comment has been minimized.

Copy link
@MarcoFalke

MarcoFalke Sep 9, 2018

Member

Should say IsWalletCompiled() or similar?

This comment has been minimized.

Copy link
@promag

promag Sep 9, 2018

Member

My suggestion HasWalletSupport().

This comment has been minimized.

Copy link
@jnewbery

jnewbery Sep 10, 2018

Author Member

Changed to HasWalletSupport()

@jnewbery jnewbery force-pushed the jnewbery:remove_wallet_enabled branch to 7d038dc Sep 10, 2018

@jnewbery

This comment has been minimized.

Copy link
Member Author

commented Sep 10, 2018

Renamed function as suggested here: #14168 (comment)

@Empact

This comment has been minimized.

Copy link
Member

commented Sep 11, 2018

utACK 7d038dc

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Sep 11, 2018

utACK 7d038dc

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Sep 11, 2018

Merge bitcoin#14168: Remove ENABLE_WALLET from libbitcoin_server.a
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

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@jnewbery jnewbery deleted the jnewbery:remove_wallet_enabled branch Sep 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.