Page MenuHomePhabricator

Fix chainparams includes
Needs ReviewPublic

Authored by PiRK on Thu, Apr 24, 11:03.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Summary

The unused includes where found by applying this scripted diff which removes the chainparamsbase header in all files where it is included, but not used. This is done by filtering against all defined symbols of the header as well as its respective .cpp file.

sed -i '/#include <chainparamsbase.h>/d' $( git grep -l 'chainparamsbase.h' | xargs grep -L 'CBaseChainParams\|CreateBaseChainParams\|SetupChainParamsBaseOptions\|BaseParams\|SelectBaseParams\|chainparamsbase.cpp' )

Then the #include was added where it was actually missing and was previously included indirectly.

This concludes backport of core#27491
https://github.com/bitcoin/bitcoin/pull/27491/commits/e9ee8aaf3acdf6dce2b339916d4c602484570050
https://github.com/bitcoin/bitcoin/pull/27491/commits/d168458d1ff987e0d741c75ac1d4b63ae0cfb7e7

Depends on D17988

Test Plan

ninja all check-all bench-bitcoin bitcoin-fuzzers

Event Timeline

PiRK requested review of this revision.Thu, Apr 24, 11:03

Tail of the build log:

[195/521] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/parse_name_tests.cpp.o
[196/521] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/write_name_tests.cpp.o
[197/521] Automatic MOC for target test_bitcoin-qt
[198/521] Building CXX object src/pow/test/CMakeFiles/test-pow.dir/daa_tests.cpp.o
[199/521] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/util_tests.cpp.o
[200/521] Test Bitcoin utilities...
[201/521] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/db_tests.cpp.o
[202/521] Building CXX object src/pow/test/CMakeFiles/test-pow.dir/eda_tests.cpp.o
[203/521] Building CXX object src/pow/test/CMakeFiles/test-pow.dir/aserti32d_tests.cpp.o
[204/521] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/options_tests.cpp.o
[205/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/compattests.cpp.o
[206/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/util.cpp.o
[207/521] Building CXX object src/pow/test/CMakeFiles/test-pow.dir/grasberg_tests.cpp.o
[208/521] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/message_writer_tests.cpp.o
[209/521] Linking CXX executable src/pow/test/test-pow
[210/521] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o
[211/521] pow: testing daa_tests
[212/521] Running utility command for check-pow-daa_tests
[213/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/bitcoinaddressvalidatortests.cpp.o
[214/521] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/p2p_messaging_tests.cpp.o
[215/521] pow: testing eda_tests
[216/521] Running utility command for check-pow-eda_tests
[217/521] Linking CXX executable src/seeder/test/test-seeder
[218/521] pow: testing grasberg_tests
[219/521] Running utility command for check-pow-grasberg_tests
[220/521] seeder: testing db_tests
[221/521] Running utility command for check-seeder-db_tests
[222/521] seeder: testing message_writer_tests
[223/521] Running utility command for check-seeder-message_writer_tests
[224/521] seeder: testing options_tests
[225/521] Running utility command for check-seeder-options_tests
[226/521] seeder: testing p2p_messaging_tests
[227/521] Running utility command for check-seeder-p2p_messaging_tests
[228/521] seeder: testing parse_name_tests
[229/521] Running utility command for check-seeder-parse_name_tests
[230/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_bitcoin-qt_autogen/mocs_compilation.cpp.o
[231/521] seeder: testing write_name_tests
[232/521] Running utility command for check-seeder-write_name_tests
[233/521] Running seeder test suite
PASSED: seeder test suite
[234/521] pow: testing aserti32d_tests
[235/521] Running utility command for check-pow-aserti32d_tests
[236/521] Running pow test suite
PASSED: pow test suite
[237/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/optiontests.cpp.o
[238/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/uritests.cpp.o
[239/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/guiutiltests.cpp.o
[240/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/apptests.cpp.o
[241/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/rpcnestedtests.cpp.o
[242/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_main.cpp.o
[243/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/__/__/wallet/test/wallet_test_fixture.cpp.o
[244/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/paymentservertests.cpp.o
[245/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/addressbooktests.cpp.o
[246/521] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/wallettests.cpp.o
[247/521] Linking CXX executable src/qt/test/test_bitcoin-qt
[248/521] bitcoin-qt: testing test_bitcoin-qt
[249/521] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang-tidy failed with exit code 1
Fabien requested changes to this revision.Thu, Apr 24, 12:40
Fabien added a subscriber: Fabien.

clang-tidy is not happy

This revision now requires changes to proceed.Thu, Apr 24, 12:40