[refactor] pass CTxMempool& to DisconnectedBlockTransactions methods
ClosedPublic
Actions

Authored by majcosta on Sep 14 2020, 21:49.

Details

Reviewers

deadalnix

Group Reviewers

Restricted Project

Commits

rABCbcc81a569012: [refactor] pass CTxMempool& to DisconnectedBlockTransactions methods

Summary

This was originally feedback given to me on D6539. Since then I've decided to pass CTxMemPool to the addForBlock method too. This avoids having to declare an extern CTxMemPool g_mempool symbol on txmempool.h, and is nicer in general.

Alternatively, I've considered adding a CTxMemPool& m_pool to DisconnectedBlockTransactions plus an explicit constructor on the assumption that such objects can only ever have one mempool they work with, but went with this instead for simplicity.

The above changes are unrelated to PR14193 however, so I'm putting them on a separate diff not to overcomplicate review of the latter.

Test Plan

ninja check check-functional

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

majcosta created this revision.Sep 14 2020, 21:49

Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 14 2020, 21:50

majcosta requested review of this revision.Sep 14 2020, 21:50

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

majcosta mentioned this in D6537: [backport#14193] txpool: Make nTransactionsUpdated atomic.Sep 14 2020, 21:51

Harbormaster completed remote builds in B12724: Diff 23480.Sep 14 2020, 21:53

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

Snippet of first build failure:

[0m[1;30mwallet_multiwallet.py                   | ○ Skipped | 0 s
[0m[1;30mwallet_multiwallet.py --usecli          | ○ Skipped | 0 s
[0m[1;30mwallet_reorgsrestore.py                 | ○ Skipped | 0 s
[0m[1;30mwallet_resendwallettransactions.py      | ○ Skipped | 0 s
[0m[1;30mwallet_txn_clone.py                     | ○ Skipped | 0 s
[0m[1;30mwallet_txn_clone.py --mineblock         | ○ Skipped | 0 s
[0m[1;30mwallet_txn_doublespend.py               | ○ Skipped | 0 s
[0m[1;30mwallet_txn_doublespend.py --mineblock   | ○ Skipped | 0 s
[0m[1;30mwallet_watchonly.py                     | ○ Skipped | 0 s
[0m[1;30mwallet_watchonly.py --usecli            | ○ Skipped | 0 s
[0m[1;30mwallet_zapwallettxes.py                 | ○ Skipped | 0 s
[0m[0;31mp2p_timeouts.py                         | ✖ Failed  | 10 s
[0m[0;31m[1m
ALL                                     | ✖ Failed  | 403 s (accumulated) 
[0m[0mRuntime: 81 s

[16/373] Test Bitcoin RPC authentication...
...
----------------------------------------------------------------------
Ran 3 tests in 0.005s

OK
[18/373] cd /work/contrib/devtools/chainparams && /usr/bin/python3.7 ./test_make_chainparams.py
.....
----------------------------------------------------------------------
Ran 5 tests in 0.001s

OK
[97/373] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/script_tests.cpp.o
In file included from /usr/include/boost/test/unit_test.hpp:19,
                 from ../../src/test/script_tests.cpp:30:
../../src/test/script_tests.cpp: In member function ‘void script_tests::script_build::test_method()’:
../../src/test/script_tests.cpp:541:22: note: variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without
 BOOST_AUTO_TEST_CASE(script_build) {
                      ^~~~~~~~~~~~
[147/373] Running seeder test suite
PASSED: seeder test suite
[152/373] Running avalanche test suite
PASSED: avalanche test suite
[160/373] Running pow test suite
PASSED: pow test suite
[167/373] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
[361/373] Running utility command for check-bitcoin-transaction_tests
FAILED: test/CMakeFiles/check-functional 
cd /work/abc-ci-builds/build-without-wallet/test && /usr/bin/cmake -E make_directory /work/abc-ci-builds/build-without-wallet/test/junit && /usr/bin/cmake -E make_directory /work/abc-ci-builds/build-without-wallet/test/log && /usr/bin/cmake -E env /usr/bin/python3.7 ./functional/test_runner.py "--testsuitename=Bitcoin ABC functional tests" --junitoutput=/work/abc-ci-builds/build-without-wallet/test/junit/functional_tests.xml
[363/373] bitcoin: testing validation_block_tests
[364/373] Running utility command for check-bitcoin-validation_block_tests
[365/373] bitcoin: testing coins_tests
[366/373] Running utility command for check-bitcoin-coins_tests
[367/373] bitcoin: testing util_tests
[368/373] Running utility command for check-bitcoin-util_tests
[369/373] bitcoin: testing op_reversebytes_tests
[370/373] Running utility command for check-bitcoin-op_reversebytes_tests
[371/373] bitcoin: testing cuckoocache_tests
[372/373] Running utility command for check-bitcoin-cuckoocache_tests
[373/373] Running bitcoin test suite
PASSED: bitcoin test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-without-wallet failed with exit code 1

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

majcosta mentioned this in D6539: [backport#14193] validation: Add missing mempool locks.Sep 14 2020, 22:00

majcosta added a child revision: D6537: [backport#14193] txpool: Make nTransactionsUpdated atomic.Sep 14 2020, 22:08

play

Harbormaster completed remote builds in B12728: Diff 23484.Sep 14 2020, 22:18

majcosta edited the summary of this revision. (Show Details)Sep 15 2020, 17:40

deadalnix accepted this revision.Sep 15 2020, 22:26

This revision is now accepted and ready to land.Sep 15 2020, 22:26

Closed by commit rABCbcc81a569012: [refactor] pass CTxMempool& to DisconnectedBlockTransactions methods (authored by majcosta). · Explain WhySep 25 2020, 17:28

This revision was automatically updated to reflect the committed changes.

majcosta added a commit: rABCbcc81a569012: [refactor] pass CTxMempool& to DisconnectedBlockTransactions methods.

PiRK mentioned this in D9780: Pass mempool reference to chainstate constructor.Jul 13 2021, 20:44