Page MenuHomePhabricator
Differential D6000

[backport#15638] [build] Move wallet load functions to wallet/load unit
ClosedPublic
Actions

Authored by majcosta on May 7 2020, 18:38.

Details

Reviewers
deadalnix
nakihito
Group Reviewers
Restricted Project
Commits
rSTAGING27b02121a34c: [backport#15638] [build] Move wallet load functions to wallet/load unit
rABC27b02121a34c: [backport#15638] [build] Move wallet load functions to wallet/load unit
Summary

Moves the following wallet load functions to a new wallet/load unit in
the libbitcoin_wallet library. All other functions in wallet/init remain
in libbitcoin_server:

  • VerifyWallets
  • LoadWallets
  • StartWallets
  • FlushWallets
  • StopWallets
  • UnloadWallets

https://github.com/bitcoin/bitcoin/pull/15638/commits/9eaeb7fb8d4ab0d4493849e6c17e314fd75fea9c

Depends on D5997

This is a partial backport of Core PR15638

Test Plan
../configure --enable-deprecated-build-system [--disable-wallet]
make check
./test/functional/test_runner.py

../cmake -GNinja [-DBUILD_BITCOIN_WALLET=OFF]
ninja check-all

Diff Detail

Event Timeline

majcosta created this revision.May 7 2020, 18:38
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 7 2020, 18:38
majcosta requested review of this revision.May 7 2020, 18:38
teamcity edited the summary of this revision. (Show Details)May 7 2020, 18:39

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

teamcity added a comment.May 7 2020, 18:48

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.May 7 2020, 19:00

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10642: Diff 19809.May 7 2020, 19:00
majcosta added a child revision: D6003: [backport#15638] [docs] Document src subdirectories and different libraries.May 7 2020, 19:08
majcosta edited the summary of this revision. (Show Details)May 7 2020, 19:21
majcosta edited the summary of this revision. (Show Details)
deadalnix requested changes to this revision.May 7 2020, 19:27
deadalnix added a subscriber: deadalnix.

cmake build is wrong.

This revision now requires changes to proceed.May 7 2020, 19:27
nakihito requested changes to this revision.May 7 2020, 19:33
nakihito added a subscriber: nakihito.

Small nit and test plan should include autotools build:

../configure -enable-deprecated-build-system
make check
src/wallet/load.cpp
82 ↗(On Diff #19809)

Newline between the functions here.

majcosta updated this revision to Diff 19836.May 8 2020, 09:52

corrected CMake build, test plan and formatting issues

teamcity added a comment.May 8 2020, 09:53

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

majcosta edited the test plan for this revision. (Show Details)May 8 2020, 10:03
teamcity added a comment.May 8 2020, 10:03

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10656: Diff 19836.May 8 2020, 10:03
nakihito accepted this revision.May 8 2020, 17:31
majcosta added a child revision: D6012: [backport#15408] Remove unused TransactionError constants.May 8 2020, 20:05
deadalnix requested changes to this revision.May 8 2020, 21:22
deadalnix added inline comments.
src/CMakeLists.txt
471

Use https://cmake.org/cmake/help/latest/command/target_sources.html instead

This revision now requires changes to proceed.May 8 2020, 21:22
majcosta updated this revision to Diff 19860.May 9 2020, 12:13

used target_sources() instead of ugly hack, hat tip @deadalnix

teamcity added a comment.May 9 2020, 12:13

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.May 9 2020, 12:23

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10671: Diff 19860.May 9 2020, 12:23
deadalnix requested changes to this revision.May 9 2020, 19:26
deadalnix added inline comments.
src/CMakeLists.txt
571 ↗(On Diff #19860)

Put that somewhere where the code make logical "paragraphs".

Also, the cmake build is still broken.

This revision now requires changes to proceed.May 9 2020, 19:26
majcosta updated this revision to Diff 19866.May 10 2020, 12:44

contained cmake build changes to wallet/CMakeLists.txt

teamcity added a comment.May 10 2020, 12:45

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.May 10 2020, 12:53

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10676: Diff 19866.May 10 2020, 12:53
deadalnix accepted this revision.May 10 2020, 18:33
deadalnix added inline comments.
src/wallet/CMakeLists.txt
12 ↗(On Diff #19866)

Adding a comment would be helpful, but that works.

This revision is now accepted and ready to land.May 10 2020, 18:33
Closed by commit rABC27b02121a34c: [backport#15638] [build] Move wallet load functions to wallet/load unit (authored by majcosta). · Explain WhyMay 10 2020, 20:07
This revision was automatically updated to reflect the committed changes.
majcosta added a commit: rABC27b02121a34c: [backport#15638] [build] Move wallet load functions to wallet/load unit.
majcosta added a commit: rSTAGING27b02121a34c: [backport#15638] [build] Move wallet load functions to wallet/load unit.May 10 2020, 20:10

Revision Contents
Changeset List

PathSize
src/
5 lines
6 lines
interfaces/
1 line
wallet/
2 lines
121 lines
43 lines
132 lines
24 lines

Diff 19836

View Options

src/CMakeLists.txt

Loading...
View Options

src/Makefile.am

Loading...
View Options

src/interfaces/wallet.cpp

Loading...
View Options

src/wallet/CMakeLists.txt

Loading...
View Options

src/wallet/init.cpp

Loading...
View Options

src/wallet/load.h

Loading...
View Options

src/wallet/load.cpp

Loading...
View Options

src/wallet/wallet.h

Loading...