Page MenuHomePhabricator
Differential D6269

Revert "[backport#15639] bitcoin-wallet tool: Drop libbitcoin_server.a dependency"
ClosedPublic
Actions

Authored by majcosta on May 27 2020, 17:00.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rABC3c12bc770217: Revert "[backport#15639] bitcoin-wallet tool: Drop libbitcoin_server.a…
Summary

This reverts commit a7a55fb3ac4f7f8b6dd97fa51b4f2cd21a871022, turns out there's still work to be done before that dependency can be dropped

it also:

  • removes redundant target_link_libraries calls related to the wallet <-> server circular dependency
  • removes a libevent dependency from wallet since the only function that needed it was moved to src/util/url.cpp
  • added an explicit libevent dependency to util, and moved the code that finds libevent to account for that

Depends on D6256

Test Plan
../configure
make

cmake .. -GNinja
ninja

Diff Detail

Event Timeline

majcosta created this revision.May 27 2020, 17:00
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 27 2020, 17:00
majcosta requested review of this revision.May 27 2020, 17:00
teamcity added a comment.May 27 2020, 17:01

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

teamcity added a comment.May 27 2020, 17:01

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

teamcity added a comment.May 27 2020, 17:01

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

teamcity added a comment.May 27 2020, 17:02

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

teamcity added a comment.May 27 2020, 17:05

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

deadalnix requested changes to this revision.May 27 2020, 17:13
deadalnix added a subscriber: deadalnix.
deadalnix added inline comments.
src/CMakeLists.txt
584

This is redundant witth he change you made in the wallet cmake file.

592

This is unecessary because wallt-tool depend on wallet and wallet depend on server

src/Makefile.am
685

likestamp

This revision now requires changes to proceed.May 27 2020, 17:13
teamcity added a comment.May 27 2020, 17:14

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

Harbormaster completed remote builds in B11050: Diff 20646.May 27 2020, 17:14
majcosta edited the summary of this revision. (Show Details)May 27 2020, 17:15
majcosta added a parent revision: D6256: [backport#15639] bitcoin-wallet tool: Drop libbitcoin_server.a dependency.
majcosta updated this revision to Diff 20647.May 27 2020, 17:25

removed redundant link commands and removed obsolete event dep

teamcity added a comment.May 27 2020, 17:25

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

teamcity added a comment.May 27 2020, 17:25

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

teamcity added a comment.May 27 2020, 17:25

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

majcosta edited the summary of this revision. (Show Details)May 27 2020, 17:26
teamcity added a comment.May 27 2020, 17:28

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

Harbormaster completed remote builds in B11051: Diff 20647.May 27 2020, 17:28
teamcity added a comment.May 27 2020, 17:28
Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) failed.

Snippet of first build failure:

2020-05-27T17:27:32.383000Z TestFramework (INFO): Test skipped
[17:28:19]i:		 [Bitcoin ABC functional tests] wallet_resendwallettransactions.py
[17:28:19]i:			 [wallet_resendwallettransactions.py] Test ignored: wallet_resendwallettransactions.py
[17:28:19]i:		 [Bitcoin ABC functional tests] [Test Output]
2020-05-27T17:28:00.145000Z TestFramework (WARNING): Test Skipped: wallet has not been compiled.
2020-05-27T17:28:00.195000Z TestFramework (INFO): Stopping nodes
2020-05-27T17:28:00.195000Z TestFramework (INFO): Cleaning up /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/wallet_resendwallettransactions_68 on exit
2020-05-27T17:28:00.195000Z TestFramework (INFO): Test skipped
[17:28:19]i:		 [Bitcoin ABC functional tests] wallet_txn_clone.py
[17:28:19]i:			 [wallet_txn_clone.py] Test ignored: wallet_txn_clone.py
[17:28:19]i:		 [Bitcoin ABC functional tests] [Test Output]
2020-05-27T17:28:06.820000Z TestFramework (WARNING): Test Skipped: wallet has not been compiled.
2020-05-27T17:28:06.870000Z TestFramework (INFO): Stopping nodes
2020-05-27T17:28:06.871000Z TestFramework (INFO): Cleaning up /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/wallet_txn_clone_86 on exit
2020-05-27T17:28:06.871000Z TestFramework (INFO): Test skipped
[17:28:19]i:		 [Bitcoin ABC functional tests] wallet_txn_clone.py --mineblock
[17:28:19]i:			 [wallet_txn_clone.py --mineblock] Test ignored: wallet_txn_clone.py --mineblock
[17:28:19]i:		 [Bitcoin ABC functional tests] [Test Output]
2020-05-27T17:28:00.233000Z TestFramework (WARNING): Test Skipped: wallet has not been compiled.
2020-05-27T17:28:00.283000Z TestFramework (INFO): Stopping nodes
2020-05-27T17:28:00.283000Z TestFramework (INFO): Cleaning up /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/wallet_txn_clone_69 on exit
2020-05-27T17:28:00.283000Z TestFramework (INFO): Test skipped
[17:28:19]i:		 [Bitcoin ABC functional tests] wallet_txn_doublespend.py
[17:28:19]i:			 [wallet_txn_doublespend.py] Test ignored: wallet_txn_doublespend.py
[17:28:19]i:		 [Bitcoin ABC functional tests] [Test Output]
2020-05-27T17:28:14.047000Z TestFramework (WARNING): Test Skipped: wallet has not been compiled.
2020-05-27T17:28:14.097000Z TestFramework (INFO): Stopping nodes
2020-05-27T17:28:14.097000Z TestFramework (INFO): Cleaning up /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/wallet_txn_doublespend_118 on exit
2020-05-27T17:28:14.097000Z TestFramework (INFO): Test skipped
[17:28:19]i:		 [Bitcoin ABC functional tests] wallet_txn_doublespend.py --mineblock
[17:28:19]i:			 [wallet_txn_doublespend.py --mineblock] Test ignored: wallet_txn_doublespend.py --mineblock
[17:28:19]i:		 [Bitcoin ABC functional tests] [Test Output]
2020-05-27T17:28:00.269000Z TestFramework (WARNING): Test Skipped: wallet has not been compiled.
2020-05-27T17:28:00.319000Z TestFramework (INFO): Stopping nodes
2020-05-27T17:28:00.319000Z TestFramework (INFO): Cleaning up /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/wallet_txn_doublespend_70 on exit
2020-05-27T17:28:00.320000Z TestFramework (INFO): Test skipped
[17:28:19]i:		 [Bitcoin ABC functional tests] wallet_zapwallettxes.py
[17:28:19]i:			 [wallet_zapwallettxes.py] Test ignored: wallet_zapwallettxes.py
[17:28:19]i:		 [Bitcoin ABC functional tests] [Test Output]
2020-05-27T17:27:53.012000Z TestFramework (WARNING): Test Skipped: wallet has not been compiled.
2020-05-27T17:27:53.063000Z TestFramework (INFO): Stopping nodes
2020-05-27T17:27:53.063000Z TestFramework (INFO): Cleaning up /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/wallet_zapwallettxes_51 on exit
2020-05-27T17:27:53.064000Z TestFramework (INFO): Test skipped
[17:28:19]i:		 [Bitcoin ABC functional tests] p2p_timeouts.py
[17:28:19]i:			 [p2p_timeouts.py] [Test Output]
2020-05-27T17:27:52.750000Z TestFramework (INFO): Initializing test directory /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/p2p_timeouts_48
2020-05-27T17:27:58.064000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 163, in main
    self.run_test()
  File "/work/test/functional/p2p_timeouts.py", line 84, in run_test
    assert not no_verack_node.is_connected
AssertionError
2020-05-27T17:27:58.747000Z TestFramework (INFO): Stopping nodes
2020-05-27T17:27:59.001000Z TestFramework (WARNING): Not cleaning up dir /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/p2p_timeouts_48
2020-05-27T17:27:59.001000Z TestFramework (ERROR): Test failed. Test logging available at /work/build/test/tmp/test_runner_₿₵_  _20200527_172731/p2p_timeouts_48/test_framework.log
2020-05-27T17:27:59.001000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/build/test/tmp/test_runner_₿₵_  _20200527_172731/p2p_timeouts_48' to consolidate all logs
[17:28:24]E:	 [Step 1/2] Failed tests detected
[17:28:28]W:	 [Step 1/2] Process exited with code 1
[17:28:28]E:	 [Step 1/2] Process exited with code 1 (Step: Command Line)

Each failure log is accessible here:
Bitcoin ABC functional tests: p2p_timeouts.py

deadalnix requested changes to this revision.May 27 2020, 17:31
deadalnix added inline comments.
src/wallet/CMakeLists.txt
10 ↗(On Diff #20647)

?

This revision now requires changes to proceed.May 27 2020, 17:31
teamcity added a comment.May 27 2020, 17:36

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

majcosta updated this revision to Diff 20648.May 27 2020, 17:54

cleaned up event leftovers

teamcity added a comment.May 27 2020, 17:54

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

teamcity added a comment.May 27 2020, 17:54

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

teamcity added a comment.May 27 2020, 17:54

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

teamcity added a comment.May 27 2020, 17:55

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

teamcity added a comment.May 27 2020, 17:58

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

Harbormaster completed remote builds in B11052: Diff 20648.May 27 2020, 18:05
teamcity added a comment.May 27 2020, 18:05

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

majcosta updated this revision to Diff 20649.May 27 2020, 18:36

add explicit libevent dependency to util library

teamcity added a comment.May 27 2020, 18:37

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

teamcity added a comment.May 27 2020, 18:37

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

teamcity added a comment.May 27 2020, 18:37

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

teamcity added a comment.May 27 2020, 18:40

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

majcosta edited the summary of this revision. (Show Details)May 27 2020, 18:42
teamcity added a comment.May 27 2020, 18:42

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

deadalnix accepted this revision.May 27 2020, 18:42
This revision is now accepted and ready to land.May 27 2020, 18:42
This revision was landed with ongoing or failed builds.May 27 2020, 18:44
Closed by commit rABC3c12bc770217: Revert "[backport#15639] bitcoin-wallet tool: Drop libbitcoin_server.a… (authored by majcosta). · Explain Why
This revision was automatically updated to reflect the committed changes.
majcosta added a commit: rABC3c12bc770217: Revert "[backport#15639] bitcoin-wallet tool: Drop libbitcoin_server.a….
teamcity added a comment.May 27 2020, 18:49

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

Harbormaster completed remote builds in B11053: Diff 20649.May 27 2020, 18:49
majcosta added a child revision: D6271: [backport#15492] [rpc] remove deprecated generate method.May 27 2020, 23:13
majcosta mentioned this in D6710: [backport#15492] [rpc] remove deprecated generate method.Jun 28 2020, 21:47
majcosta mentioned this in rABC1ad604ee3ee1: [backport#15492] [rpc] remove deprecated generate method.Jun 30 2020, 20:08

Revision Contents
Changeset List

PathSize
src/
2 lines
1 line
wallet/
2 lines

Diff 20646

View Options

src/CMakeLists.txt

Loading...
View Options

src/Makefile.am

Loading...
View Options

src/wallet/CMakeLists.txt

Loading...