Page MenuHomePhabricator

test: Remove no longer needed MakeChain calls
ClosedPublic

Authored by PiRK on May 5 2022, 15:00.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABCe2fe3b8441b9: test: Remove no longer needed MakeChain calls
Summary

These calls are no longer needed after edc3160
from #19098 which started instantiating BasicTestingSetup.m_node.chain

Co-authored-by: MarcoFalke <falke.marco@gmail.com>

This is a backport of core#19425 [3/3]
https://github.com/bitcoin/bitcoin/pull/19425/commits/5baa88fd38c8efa0e361636bb2c60af89d27b5d5

Depends on D11419

Test Plan

ninja check

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

PiRK requested review of this revision.May 5 2022, 15:00

Tail of the build log:

[172/470] Running utility command for check-avalanche-init_tests
[173/470] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/options_tests.cpp.o
[174/470] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/coinselector_tests.cpp.o
[175/470] avalanche: testing proofpool_tests
[176/470] Running utility command for check-avalanche-proofpool_tests
[177/470] avalanche: testing proofcomparator_tests
[178/470] Running utility command for check-avalanche-proofcomparator_tests
[179/470] avalanche: testing proof_tests
[180/470] Linking CXX executable src/pow/test/test-pow
[181/470] Running utility command for check-avalanche-proof_tests
[182/470] pow: testing eda_tests
[183/470] avalanche: testing peermanager_tests
[184/470] Running utility command for check-pow-eda_tests
[185/470] Running utility command for check-avalanche-peermanager_tests
[186/470] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/message_writer_tests.cpp.o
[187/470] pow: testing daa_tests
[188/470] Running utility command for check-pow-daa_tests
[189/470] pow: testing grasberg_tests
[190/470] Running utility command for check-pow-grasberg_tests
[191/470] Linking CXX executable src/seeder/test/test-seeder
[192/470] avalanche: testing processor_tests
[193/470] seeder: testing write_name_tests
[194/470] Running utility command for check-avalanche-processor_tests
[195/470] Running utility command for check-seeder-write_name_tests
[196/470] Running avalanche test suite
PASSED: avalanche test suite
[197/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/util.cpp.o
[198/470] seeder: testing message_writer_tests
[199/470] seeder: testing options_tests
[200/470] Running utility command for check-seeder-message_writer_tests
[201/470] Running utility command for check-seeder-options_tests
[202/470] seeder: testing p2p_messaging_tests
[203/470] Running utility command for check-seeder-p2p_messaging_tests
[204/470] seeder: testing parse_name_tests
[205/470] Running utility command for check-seeder-parse_name_tests
[206/470] Running seeder test suite
PASSED: seeder test suite
[207/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_bitcoin-qt_autogen/mocs_compilation.cpp.o
[208/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/guiutiltests.cpp.o
[209/470] secp256k1: testing secp256k1-tests
[210/470] Running secp256k1 test suite
PASSED: secp256k1 test suite
[211/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/uritests.cpp.o
[212/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/apptests.cpp.o
[213/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_main.cpp.o
[214/470] pow: testing aserti32d_tests
[215/470] Running utility command for check-pow-aserti32d_tests
[216/470] Running pow test suite
PASSED: pow test suite
[217/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/__/__/wallet/test/wallet_test_fixture.cpp.o
[218/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/paymentservertests.cpp.o
[219/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/addressbooktests.cpp.o
[220/470] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/util_tests.cpp.o
[221/470] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/wallettests.cpp.o
[222/470] Linking CXX executable src/qt/test/test_bitcoin-qt
[223/470] bitcoin-qt: testing test_bitcoin-qt
[224/470] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1

Tail of the build log:

[173/463] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/options_tests.cpp.o
[174/463] pow: testing eda_tests
[175/463] pow: testing daa_tests
[176/463] pow: testing grasberg_tests
[177/463] Running utility command for check-pow-eda_tests
[178/463] Running utility command for check-pow-daa_tests
[179/463] Running utility command for check-pow-grasberg_tests
[180/463] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/coinselector_tests.cpp.o
[181/463] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/message_writer_tests.cpp.o
[182/463] Linking CXX executable src/seeder/test/test-seeder
[183/463] seeder: testing write_name_tests
[184/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/compattests.cpp.o
[185/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/bitcoinaddressvalidatortests.cpp.o
[186/463] Running utility command for check-seeder-write_name_tests
[187/463] seeder: testing message_writer_tests
[188/463] seeder: testing options_tests
[189/463] Running utility command for check-seeder-message_writer_tests
[190/463] Running utility command for check-seeder-options_tests
[191/463] seeder: testing p2p_messaging_tests
[192/463] Running utility command for check-seeder-p2p_messaging_tests
[193/463] seeder: testing parse_name_tests
[194/463] Running utility command for check-seeder-parse_name_tests
[195/463] Running seeder test suite
PASSED: seeder test suite
[196/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/util.cpp.o
[197/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/guiutiltests.cpp.o
[198/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_bitcoin-qt_autogen/mocs_compilation.cpp.o
[199/463] Test Bitcoin RPC authentication...
...
----------------------------------------------------------------------
Ran 3 tests in 0.007s

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

OK
[201/463] Test Bitcoin utilities...
[202/463] pow: testing aserti32d_tests
[203/463] Running utility command for check-pow-aserti32d_tests
[204/463] Running pow test suite
PASSED: pow test suite
[205/463] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/util_tests.cpp.o
[206/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/uritests.cpp.o
[207/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/apptests.cpp.o
[208/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_main.cpp.o
[209/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/rpcnestedtests.cpp.o
[210/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/__/__/wallet/test/wallet_test_fixture.cpp.o
[211/463] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/script_tests.cpp.o
[212/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/paymentservertests.cpp.o
[213/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/addressbooktests.cpp.o
[214/463] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/wallettests.cpp.o
[215/463] Linking CXX executable src/qt/test/test_bitcoin-qt
[216/463] bitcoin-qt: testing test_bitcoin-qt
[217/463] 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
PiRK planned changes to this revision.May 5 2022, 15:10

Looks like a typo made it through.

Tail of the build log:

wallet_labels.py                                       | ✓ Passed  | 2 s
wallet_labels.py --descriptors                         | ✓ Passed  | 2 s
wallet_listreceivedby.py                               | ✓ Passed  | 16 s
wallet_listsinceblock.py                               | ✓ Passed  | 7 s
wallet_listsinceblock.py --descriptors                 | ✓ Passed  | 11 s
wallet_listtransactions.py                             | ✓ Passed  | 4 s
wallet_listtransactions.py --descriptors               | ✓ Passed  | 4 s
wallet_multiwallet.py                                  | ✓ Passed  | 47 s
wallet_multiwallet.py --usecli                         | ✓ Passed  | 16 s
wallet_reorgsrestore.py                                | ✓ Passed  | 4 s
wallet_resendwallettransactions.py                     | ✓ Passed  | 7 s
wallet_send.py                                         | ✓ Passed  | 7 s
wallet_startup.py                                      | ✓ Passed  | 3 s
wallet_txn_clone.py                                    | ✓ Passed  | 3 s
wallet_txn_clone.py --mineblock                        | ✓ Passed  | 4 s
wallet_txn_doublespend.py                              | ✓ Passed  | 3 s
wallet_txn_doublespend.py --mineblock                  | ✓ Passed  | 4 s
wallet_watchonly.py                                    | ✓ Passed  | 1 s
wallet_watchonly.py --usecli                           | ✓ Passed  | 2 s

ALL                                                    | ✓ Passed  | 1681 s (accumulated) 
Runtime: 337 s

----------------------------------------------------------------------
Ran 10 tests in 0.144s

OK

[34/471] Test Bitcoin RPC authentication...
...
----------------------------------------------------------------------
Ran 3 tests in 0.004s

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

OK
[193/471] Running seeder test suite
PASSED: seeder test suite
[209/471] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o
FAILED: src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o 
/usr/bin/ccache /usr/bin/c++ -DABORT_ON_FAILED_ASSUME -DBOOST_AC_USE_STD_ATOMIC -DBOOST_SP_USE_STD_ATOMIC -DBOOST_TEST_DYN_LINK -DBUILD_BITCOIN_INTERNAL -DDEBUG -DDEBUG_LOCKORDER -DENABLE_AVX2 -DENABLE_SHANI -DENABLE_SSE41 -DHAVE_BUILD_INFO -DHAVE_CONFIG_H -DHAVE_CONSENSUS_LIB -DLEVELDB_ATOMIC_PRESENT -DLEVELDB_PLATFORM_POSIX -DOS_LINUX -I../../src/univalue/include -I../../src/. -Isrc -Isrc/crypto/.. -I../../src/secp256k1/include -I../../src/leveldb/include -isystem /usr/include/jemalloc -isystem /usr/include/miniupnpc -Werror -O0 -fPIE -fvisibility=hidden -g3 -ftrapv -fstack-reuse=none -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -Wall -Wextra -Wformat -Wvla -Wcast-align -Wunused-parameter -Wmissing-braces -Wredundant-decls -Wsign-compare -Wduplicated-branches -Wduplicated-cond -Wlogical-op -Wformat-security -Woverloaded-virtual -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -std=gnu++17 -MD -MT src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o -MF src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o.d -o src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o -c ../../src/wallet/test/wallet_tests.cpp
../../src/wallet/test/wallet_tests.cpp: In member function ‘void wallet_tests::CreateWallet::test_method()’:
../../src/wallet/test/wallet_tests.cpp:846:37: error: ‘struct NodeContext’ has no member named ‘hain’; did you mean ‘chain’?
     wallet = TestLoadWallet(*m_node.hain);
                                     ^~~~
                                     chain
[214/471] Running avalanche test suite
PASSED: avalanche test suite
[219/471] Running pow test suite
PASSED: pow test suite
[222/471] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
[224/471] Running secp256k1 test suite
PASSED: secp256k1 test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-debug failed with exit code 1

fix typo and rerun proper test plan

Tail of the build log:

wallet_abandonconflict.py                              | ✓ Passed  | 6 s
wallet_address_types.py                                | ✓ Passed  | 14 s
wallet_address_types.py --descriptors                  | ✓ Passed  | 8 s
wallet_avoidreuse.py                                   | ✓ Passed  | 7 s
wallet_avoidreuse.py --descriptors                     | ✓ Passed  | 4 s
wallet_backup.py                                       | ✓ Passed  | 22 s
wallet_balance.py                                      | ✓ Passed  | 9 s
wallet_balance.py --descriptors                        | ✓ Passed  | 26 s
wallet_basic.py                                        | ✓ Passed  | 20 s
wallet_coinbase_category.py                            | ✓ Passed  | 1 s
wallet_create_tx.py                                    | ✓ Passed  | 8 s
wallet_createwallet.py                                 | ✓ Passed  | 2 s
wallet_createwallet.py --descriptors                   | ✓ Passed  | 2 s
wallet_createwallet.py --usecli                        | ✓ Passed  | 3 s
wallet_descriptor.py                                   | ✓ Passed  | 8 s
wallet_disable.py                                      | ✓ Passed  | 1 s
wallet_dump.py                                         | ✓ Passed  | 5 s
wallet_encryption.py                                   | ✓ Passed  | 5 s
wallet_encryption.py --descriptors                     | ✓ Passed  | 5 s
wallet_hd.py                                           | ✓ Passed  | 6 s
wallet_hd.py --descriptors                             | ✓ Passed  | 5 s
wallet_import_rescan.py                                | ✓ Passed  | 5 s
wallet_import_with_label.py                            | ✓ Passed  | 1 s
wallet_importdescriptors.py                            | ✓ Passed  | 6 s
wallet_importmulti.py                                  | ✓ Passed  | 3 s
wallet_importprunedfunds.py                            | ✓ Passed  | 2 s
wallet_importprunedfunds.py --descriptors              | ✓ Passed  | 2 s
wallet_keypool.py                                      | ✓ Passed  | 3 s
wallet_keypool_topup.py                                | ✓ Passed  | 3 s
wallet_keypool_topup.py --descriptors                  | ✓ Passed  | 3 s
wallet_labels.py                                       | ✓ Passed  | 2 s
wallet_labels.py --descriptors                         | ✓ Passed  | 2 s
wallet_listreceivedby.py                               | ✓ Passed  | 14 s
wallet_listsinceblock.py                               | ✓ Passed  | 4 s
wallet_listsinceblock.py --descriptors                 | ✓ Passed  | 7 s
wallet_listtransactions.py                             | ✓ Passed  | 4 s
wallet_listtransactions.py --descriptors               | ✓ Passed  | 3 s
wallet_multiwallet.py                                  | ✓ Passed  | 40 s
wallet_multiwallet.py --usecli                         | ✓ Passed  | 10 s
wallet_reorgsrestore.py                                | ✓ Passed  | 3 s
wallet_resendwallettransactions.py                     | ✓ Passed  | 16 s
wallet_send.py                                         | ✓ Passed  | 7 s
wallet_startup.py                                      | ✓ Passed  | 2 s
wallet_txn_clone.py                                    | ✓ Passed  | 2 s
wallet_txn_clone.py --mineblock                        | ✓ Passed  | 3 s
wallet_txn_doublespend.py                              | ✓ Passed  | 1 s
wallet_txn_doublespend.py --mineblock                  | ✓ Passed  | 2 s
wallet_watchonly.py                                    | ✓ Passed  | 1 s
wallet_watchonly.py --usecli                           | ✓ Passed  | 1 s

ALL                                                    | ✓ Passed  | 1252 s (accumulated) 
Runtime: 251 s

----------------------------------------------------------------------
Ran 10 tests in 0.094s

OK

ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1
This revision is now accepted and ready to land.May 5 2022, 16:00
This revision was automatically updated to reflect the committed changes.