Page MenuHomePhabricator

Pass chain and client variables where needed
ClosedPublic

Authored by Fabien on Jan 27 2020, 09:16.

Details

Summary
This commit does not change behavior. All it does is pass new function
parameters.

Partial backport of core PR14437:
https://github.com/bitcoin/bitcoin/pull/14437/commits/8db11dd0b182a93042899651545cc21b34bf0742#diff-c0ec078346af03640b953e854ff6609a

Depends on D5064.

Test Plan
ninja check bitcoin-bench

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Fabien created this revision.Jan 27 2020, 09:16
Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 27 2020, 09:16
teamcity edited the summary of this revision. (Show Details)Jan 27 2020, 09:16

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

Fabien edited the summary of this revision. (Show Details)Jan 27 2020, 09:16

Snippet of first build failure:

[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_importprunedfunds.py             | ✓ Passed  | 2 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_keypool.py                       | ✓ Passed  | 3 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_keypool_topup.py                 | ✓ Passed  | 2 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_labels.py                        | ✓ Passed  | 4 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_listreceivedby.py                | ✓ Passed  | 5 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_listsinceblock.py                | ✓ Passed  | 1 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_listtransactions.py              | ✓ Passed  | 15 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_multiwallet.py                   | ✓ Passed  | 8 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_multiwallet.py --usecli          | ✓ Passed  | 14 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_resendwallettransactions.py      | ✓ Passed  | 1 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_txn_clone.py                     | ✓ Passed  | 3 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_txn_clone.py --mineblock         | ✓ Passed  | 3 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_txn_doublespend.py               | ✓ Passed  | 3 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_txn_doublespend.py --mineblock   | ✓ Passed  | 3 s
[09:20:37] :	 [Step 1/1]  [0m [0;34mwallet_zapwallettxes.py                 | ✓ Passed  | 2 s
[09:20:37] :	 [Step 1/1]  [0m [1m
[09:20:37] :	 [Step 1/1] ALL                                     | ✓ Passed  | 518 s (accumulated) 
[09:20:37] :	 [Step 1/1]  [0mRuntime: 116 s
[09:20:37] :	 [Step 1/1] 
[09:20:37] :	 [Step 1/1] [99/354] cd /home/teamcity/buildAgent/work/c4a5708f2bae7929/contrib/devtools/chainparams && /usr/bin/python3 ./test_make_chainparams.py
[09:20:37] :	 [Step 1/1] .....
[09:20:37] :	 [Step 1/1] ----------------------------------------------------------------------
[09:20:37] :	 [Step 1/1] Ran 5 tests in 0.001s
[09:20:37] :	 [Step 1/1] 
[09:20:37] :	 [Step 1/1] OK
[09:20:37] :	 [Step 1/1] [188/354] Running secp256k1 test suite
[09:20:37] :	 [Step 1/1] PASSED: secp256k1 test suite
[09:20:37] :	 [Step 1/1] [213/354] Running leveldb test suite
[09:20:37] :	 [Step 1/1] PASSED: leveldb test suite
[09:20:37] :	 [Step 1/1] [217/354] Running bitcoin-seeder test suite
[09:20:37] :	 [Step 1/1] PASSED: bitcoin-seeder test suite
[09:20:37] :	 [Step 1/1] [245/354] Running bitcoin-qt test suite
[09:20:37] :	 [Step 1/1] PASSED: bitcoin-qt test suite
[09:20:37] :	 [Step 1/1] [246/354] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/script_tests.cpp.o
[09:20:37] :	 [Step 1/1] In file included from /usr/include/boost/test/unit_test.hpp:19,
[09:20:37] :	 [Step 1/1]                  from ../src/test/script_tests.cpp:29:
[09:20:37] :	 [Step 1/1] ../src/test/script_tests.cpp: In member function ‘void script_tests::script_build::test_method()’:
[09:20:37] :	 [Step 1/1] ../src/test/script_tests.cpp:575:22: note: variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without
[09:20:37] :	 [Step 1/1]  BOOST_AUTO_TEST_CASE(script_build) {
[09:20:37] :	 [Step 1/1]                       ^~~~~~~~~~~~
[09:20:37] :	 [Step 1/1] [310/354] bitcoin: testing rpc_tests
[09:20:37] :	 [Step 1/1] FAILED: src/test/CMakeFiles/check-bitcoin-rpc_tests 
[09:20:37] :	 [Step 1/1] cd /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/src/test && /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/src/test/run-rpc_tests.sh
[09:20:37] :	 [Step 1/1] Running 10 test cases...
[09:20:37] :	 [Step 1/1] unknown location(0): fatal error: in "rpc_tests/rpc_rawsign_missing_amount": memory access violation at address: 0x00000000: no mapping at fault address
[09:20:37] :	 [Step 1/1] ../src/test/rpc_tests.cpp(33): last checkpoint
[09:20:37] :	 [Step 1/1] 
[09:20:37] :	 [Step 1/1] *** 1 failure is detected in the test module "Bitcoin Test Suite"
[09:20:37] :	 [Step 1/1] test_bitcoin: /usr/include/boost/thread/pthread/condition_variable_fwd.hpp:85: boost::condition_variable::~condition_variable(): Assertion `!ret' failed.
[09:20:37]W:	 [Step 1/1] ++ print_sanitizers_log
[09:20:37] :	 [Step 1/1] Aborted
[09:20:37]W:	 [Step 1/1] ++ for log in "${SAN_LOG_DIR}"/*.log.*
[09:20:37] :	 [Step 1/1] [322/354] bitcoin: testing transaction_tests
[09:20:37]W:	 [Step 1/1] ++ echo '*** Output of /tmp/sanitizer_logs/*.log.* ***'
[09:20:37] :	 [Step 1/1] ninja: build stopped: subcommand failed.
[09:20:37]W:	 [Step 1/1] ++ cat '/tmp/sanitizer_logs/*.log.*'
[09:20:37] :	 [Step 1/1] *** Output of /tmp/sanitizer_logs/*.log.* ***
[09:20:37]W:	 [Step 1/1] cat: '/tmp/sanitizer_logs/*.log.*': No such file or directory
[09:20:37]W:	 [Step 1/1] Process exited with code 1
[09:20:37]E:	 [Step 1/1] Process exited with code 1 (Step: Command Line)
Fabien added inline comments.Jan 27 2020, 09:27
src/rpc/util.h
8 ↗(On Diff #15804)

Note to reviewers: this is not from the PR, but was not ported in D3139. It was previously indirectly included, and failed with these changes due to missing definition for CTxDestination. Since it's a typedef a forward declaration is not really suitable.

Fabien updated this revision to Diff 15805.Jan 27 2020, 09:51

Fix build failure.
Interestingly it only fails when built with GCC, all is green with Clang.

deadalnix accepted this revision.Jan 27 2020, 15:38
deadalnix added a subscriber: deadalnix.
deadalnix added inline comments.
src/rpc/util.h
8 ↗(On Diff #15805)

This does not look necessary.

This revision is now accepted and ready to land.Jan 27 2020, 15:38
This revision was automatically updated to reflect the committed changes.