[net processing] Rename CNodeState compact block members
ClosedPublic
Actions

Authored by PiRK on Nov 29 2023, 10:38.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABC5c6dd211ffbd: [net processing] Rename CNodeState compact block members

Summary

fPreferHeaderAndIDs -> m_requested_hb_cmpctblocks
fProvidesHeaderAndIDs -> m_provides_cmpctblocks

This concludes backport of core#20799
https://github.com/bitcoin/bitcoin/pull/20799/commits/3b6bfbce386f61dcbb366f08cfff55c3882f429c#
Depends on D14874

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 25774
Build 51128: Build Diff	build-clang-tidy · lint-circular-dependencies · build-without-wallet · build-diff · build-debug · build-clang
Build 51127: arc lint + arc unit

Event Timeline

PiRK created this revision.Nov 29 2023, 10:38

Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 29 2023, 10:38

PiRK requested review of this revision.Nov 29 2023, 10:38

teamcity edited the summary of this revision. (Show Details)Nov 29 2023, 10:39

Harbormaster completed remote builds in B25770: Diff 43307.Nov 29 2023, 10:48

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

Tail of the build log:

[0m[1;30mwallet_keypool.py                          | ○ Skipped | 0 s
[0m[1;30mwallet_keypool_topup.py                    | ○ Skipped | 0 s
[0m[1;30mwallet_keypool_topup.py --descriptors      | ○ Skipped | 0 s
[0m[1;30mwallet_labels.py                           | ○ Skipped | 0 s
[0m[1;30mwallet_labels.py --descriptors             | ○ Skipped | 0 s
[0m[1;30mwallet_listreceivedby.py                   | ○ Skipped | 0 s
[0m[1;30mwallet_listsinceblock.py                   | ○ Skipped | 0 s
[0m[1;30mwallet_listsinceblock.py --descriptors     | ○ Skipped | 0 s
[0m[1;30mwallet_listtransactions.py                 | ○ Skipped | 0 s
[0m[1;30mwallet_listtransactions.py --descriptors   | ○ Skipped | 0 s
[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_send.py                             | ○ Skipped | 0 s
[0m[1;30mwallet_startup.py                          | ○ Skipped | 0 s
[0m[1;30mwallet_timelock.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[1m
ALL                                        | ✓ Passed  | 792 s (accumulated) 
[0mRuntime: 159 s

[31/450] Test Bitcoin RPC authentication...
...
----------------------------------------------------------------------
Ran 3 tests in 0.004s

OK
[32/450] cd /work/contrib/devtools/chainparams && /usr/bin/python3.9 ./test_make_chainparams.py
.....
----------------------------------------------------------------------
Ran 5 tests in 0.001s

OK
[127/450] 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:540:22: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
  540 | BOOST_AUTO_TEST_CASE(script_build) {
      |                      ^~~~~~~~~~~~
[307/450] avalanche: testing processor_tests
FAILED: src/avalanche/test/CMakeFiles/check-avalanche-processor_tests 
cd /work/abc-ci-builds/build-without-wallet/src/avalanche/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 /work/cmake/utils/log-and-print-on-failure.sh /work/abc-ci-builds/build-without-wallet/test/log/avalanche-processor_tests.log /work/abc-ci-builds/build-without-wallet/src/avalanche/test/test-avalanche --run_test=processor_tests --logger=HRF,message:JUNIT,message,avalanche-processor_tests.xml --catch_system_errors=no
Segmentation fault (core dumped)
[414/450] Running pow test suite
PASSED: pow test suite
[422/450] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
[428/450] Running seeder test suite
PASSED: seeder test suite
[447/450] 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

unrelated segfault in a unit test

Fabien accepted this revision.Nov 29 2023, 12:11

This revision is now accepted and ready to land.Nov 29 2023, 12:11

rebase

This revision was landed with ongoing or failed builds.Nov 29 2023, 17:07

Closed by commit rABC5c6dd211ffbd: [net processing] Rename CNodeState compact block members (authored by PiRK). · Explain Why

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABC5c6dd211ffbd: [net processing] Rename CNodeState compact block members.

Harbormaster completed remote builds in B25774: Diff 43318.Nov 29 2023, 17:19