Page MenuHomePhabricator
Differential D15757

Remove ::fIsBareMultisigStd global
ClosedPublic
Actions

Authored by PiRK on Mar 21 2024, 16:16.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABCfb43a8161191: Remove ::fIsBareMultisigStd global
Summary

This is a backport of core#25648
https://github.com/bitcoin/bitcoin/pull/25648/commits/fa2f6c1a611dffe5a3f63fe1b453f1dd420371b1

Depends on D15755

Test Plan

ninja all check-all

Diff Detail

Event Timeline

PiRK created this revision.Mar 21 2024, 16:16
Herald added a reviewer: Restricted Project. · View Herald TranscriptMar 21 2024, 16:16
teamcity edited the summary of this revision. (Show Details)Mar 21 2024, 16:16
Harbormaster completed remote builds in B27975: Diff 46356.Mar 21 2024, 16:46
teamcity added a comment.Mar 21 2024, 16:46
Build Bitcoin ABC Diffs / Diff Testing (build-clang) failed.

Tail of the build log:

PASS   : AppTests::initTestCase()
QINFO  : AppTests::appTests() Backing up GUI settings to "/tmp/test_common_Bitcoin ABC/7dcb0d62266ac75f524b4dc63ca8079fb21e6aa5003c7ca5c3cf8d2d483b9fe7/regtest/guisettings.ini.bak"
QDEBUG : AppTests::appTests() requestInitialize : Requesting initialize
QDEBUG : AppTests::appTests() initialize : Running initialization in thread
QDEBUG : AppTests::appTests() initializeResult : Initialization result:  true
QINFO  : AppTests::appTests() Platform customization: "other"
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QWARN  : AppTests::appTests() This plugin does not support raise()
QWARN  : AppTests::appTests() This plugin does not support raise()
QWARN  : AppTests::appTests() This plugin does not support grabbing the keyboard
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QDEBUG : AppTests::appTests() requestShutdown : Requesting shutdown
QDEBUG : AppTests::appTests() shutdown : Running Shutdown in thread
QDEBUG : AppTests::appTests() shutdown : Shutdown finished
PASS   : AppTests::appTests()
PASS   : AppTests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 448ms
********* Finished testing of AppTests *********
********* Start testing of OptionTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : OptionTests::initTestCase()
PASS   : OptionTests::optionTests()
PASS   : OptionTests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 27ms
********* Finished testing of OptionTests *********
********* Start testing of URITests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : URITests::initTestCase()
PASS   : URITests::uriTestsCashAddr()
PASS   : URITests::uriTestFormatURI()
PASS   : URITests::cleanupTestCase()
Totals: 4 passed, 0 failed, 0 skipped, 0 blacklisted, 1ms
********* Finished testing of URITests *********
********* Start testing of PaymentServerTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : PaymentServerTests::initTestCase()
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::initNetManager: No active proxy server found.

=== Received signal at function time: 37ms, total time: 38ms, dumping stack ===
=== End of stack trace ===
QFATAL : PaymentServerTests::paymentServerTests() Received signal 11
         Function time: 37ms Total time: 38ms
FAIL!  : PaymentServerTests::paymentServerTests() Received a fatal error.
   Loc: [Unknown file(0)]
Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted, 38ms
********* Finished testing of PaymentServerTests *********
Aborted (core dumped)
[490/499] bitcoin: testing blockcheck_tests
[491/499] Running utility command for check-bitcoin-blockcheck_tests
[492/499] bitcoin: testing coinselector_tests
[493/499] Running utility command for check-bitcoin-coinselector_tests
[494/499] bitcoin: testing wallet_tests
[495/499] Running utility command for check-bitcoin-wallet_tests
[496/499] bitcoin: testing coins_tests
[497/499] Running utility command for check-bitcoin-coins_tests
[498/499] Running bitcoin test suite
PASSED: bitcoin test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1
teamcity added a comment.Mar 21 2024, 16:50
Build Bitcoin ABC Diffs / Diff Testing (build-clang-tidy) failed.

Tail of the build log:

[488/492] Running utility command for check-bitcoin-coins_tests
[489/492] Running bitcoin test suite
PASSED: bitcoin test suite
[490/492] Linking CXX executable src/qt/test/test_bitcoin-qt
[491/492] bitcoin-qt: testing test_bitcoin-qt
FAILED: src/qt/test/CMakeFiles/check-bitcoin-qt-test_bitcoin-qt 
cd /work/abc-ci-builds/build-clang-tidy/src/qt/test && /usr/bin/cmake -E make_directory /work/abc-ci-builds/build-clang-tidy/test/junit && /usr/bin/cmake -E make_directory /work/abc-ci-builds/build-clang-tidy/test/log && /usr/bin/cmake -E env /work/cmake/utils/log-and-print-on-failure.sh /work/abc-ci-builds/build-clang-tidy/test/log/bitcoin-qt-test_bitcoin-qt.log /work/abc-ci-builds/build-clang-tidy/src/qt/test/test_bitcoin-qt
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-root'
********* Start testing of AppTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : AppTests::initTestCase()
QINFO  : AppTests::appTests() Backing up GUI settings to "/tmp/test_common_Bitcoin ABC/87420a6ac0bcfbc1065db0f3496872b9f03ebc98a991bc5ae841643c00345206/regtest/guisettings.ini.bak"
QDEBUG : AppTests::appTests() requestInitialize : Requesting initialize
QDEBUG : AppTests::appTests() initialize : Running initialization in thread
QDEBUG : AppTests::appTests() initializeResult : Initialization result:  true
QINFO  : AppTests::appTests() Platform customization: "other"
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QWARN  : AppTests::appTests() This plugin does not support raise()
QWARN  : AppTests::appTests() This plugin does not support raise()
QWARN  : AppTests::appTests() This plugin does not support grabbing the keyboard
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QDEBUG : AppTests::appTests() requestShutdown : Requesting shutdown
QDEBUG : AppTests::appTests() shutdown : Running Shutdown in thread
QDEBUG : AppTests::appTests() shutdown : Shutdown finished
PASS   : AppTests::appTests()
PASS   : AppTests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 516ms
********* Finished testing of AppTests *********
********* Start testing of OptionTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : OptionTests::initTestCase()
PASS   : OptionTests::optionTests()
PASS   : OptionTests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 28ms
********* Finished testing of OptionTests *********
********* Start testing of URITests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : URITests::initTestCase()
PASS   : URITests::uriTestsCashAddr()
PASS   : URITests::uriTestFormatURI()
PASS   : URITests::cleanupTestCase()
Totals: 4 passed, 0 failed, 0 skipped, 0 blacklisted, 1ms
********* Finished testing of URITests *********
********* Start testing of PaymentServerTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : PaymentServerTests::initTestCase()
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::initNetManager: No active proxy server found.

=== Received signal at function time: 59ms, total time: 60ms, dumping stack ===
=== End of stack trace ===
QFATAL : PaymentServerTests::paymentServerTests() Received signal 11
         Function time: 59ms Total time: 60ms
FAIL!  : PaymentServerTests::paymentServerTests() Received a fatal error.
   Loc: [Unknown file(0)]
Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted, 61ms
********* Finished testing of PaymentServerTests *********
Aborted (core dumped)
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang-tidy failed with exit code 1
teamcity added a comment.Mar 21 2024, 17:00
Build Bitcoin ABC Diffs / Diff Testing (build-debug) failed.

Tail of the build log:

[481/500] Running avalanche test suite
PASSED: avalanche test suite
[485/500] bitcoin-qt: testing test_bitcoin-qt
FAILED: src/qt/test/CMakeFiles/check-bitcoin-qt-test_bitcoin-qt 
cd /work/abc-ci-builds/build-debug/src/qt/test && /usr/bin/cmake -E make_directory /work/abc-ci-builds/build-debug/test/junit && /usr/bin/cmake -E make_directory /work/abc-ci-builds/build-debug/test/log && /usr/bin/cmake -E env /work/cmake/utils/log-and-print-on-failure.sh /work/abc-ci-builds/build-debug/test/log/bitcoin-qt-test_bitcoin-qt.log /work/abc-ci-builds/build-debug/src/qt/test/test_bitcoin-qt
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-root'
********* Start testing of AppTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : AppTests::initTestCase()
QINFO  : AppTests::appTests() Backing up GUI settings to "/tmp/test_common_Bitcoin ABC/ac235246289f87f885bcefe71c860e58dad22531f37425d34159936d1dc28e1f/regtest/guisettings.ini.bak"
QDEBUG : AppTests::appTests() requestInitialize : Requesting initialize
QDEBUG : AppTests::appTests() initialize : Running initialization in thread
QDEBUG : AppTests::appTests() initializeResult : Initialization result:  true
QINFO  : AppTests::appTests() Platform customization: "other"
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QWARN  : AppTests::appTests() This plugin does not support raise()
QWARN  : AppTests::appTests() This plugin does not support raise()
QWARN  : AppTests::appTests() This plugin does not support grabbing the keyboard
QWARN  : AppTests::appTests() This plugin does not support propagateSizeHints()
QDEBUG : AppTests::appTests() requestShutdown : Requesting shutdown
QDEBUG : AppTests::appTests() shutdown : Running Shutdown in thread
QDEBUG : AppTests::appTests() shutdown : Shutdown finished
PASS   : AppTests::appTests()
PASS   : AppTests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 682ms
********* Finished testing of AppTests *********
********* Start testing of OptionTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : OptionTests::initTestCase()
PASS   : OptionTests::optionTests()
PASS   : OptionTests::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 33ms
********* Finished testing of OptionTests *********
********* Start testing of URITests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : URITests::initTestCase()
PASS   : URITests::uriTestsCashAddr()
PASS   : URITests::uriTestFormatURI()
PASS   : URITests::cleanupTestCase()
Totals: 4 passed, 0 failed, 0 skipped, 0 blacklisted, 1ms
********* Finished testing of URITests *********
********* Start testing of PaymentServerTests *********
Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20210110), debian 11
PASS   : PaymentServerTests::initTestCase()
QDEBUG : PaymentServerTests::paymentServerTests() PaymentServer::initNetManager: No active proxy server found.

=== Received signal at function time: 65ms, total time: 65ms, dumping stack ===
=== End of stack trace ===
QFATAL : PaymentServerTests::paymentServerTests() Received signal 11
         Function time: 65ms Total time: 65ms
FAIL!  : PaymentServerTests::paymentServerTests() Received a fatal error.
   Loc: [Unknown file(0)]
Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted, 66ms
********* Finished testing of PaymentServerTests *********
Aborted (core dumped)
[498/500] Running bitcoin test suite
PASSED: bitcoin test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-debug failed with exit code 1
teamcity added a comment.Mar 21 2024, 17:06
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Tail of the build log:

wallet_multiwallet.py                      | ✓ Passed  | 42 s
wallet_multiwallet.py --descriptors        | ✓ Passed  | 14 s
wallet_multiwallet.py --usecli             | ✓ Passed  | 15 s
wallet_reorgsrestore.py                    | ✓ Passed  | 6 s
wallet_resendwallettransactions.py         | ✓ Passed  | 6 s
wallet_send.py                             | ✓ Passed  | 9 s
wallet_startup.py                          | ✓ Passed  | 6 s
wallet_timelock.py                         | ✓ Passed  | 1 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  | 2 s
wallet_watchonly.py --usecli               | ✓ Passed  | 3 s
chronik_avalanche.py                       | ○ Skipped | 0 s
chronik_block.py                           | ○ Skipped | 0 s
chronik_block_info.py                      | ○ Skipped | 0 s
chronik_block_txs.py                       | ○ Skipped | 0 s
chronik_blockchain_info.py                 | ○ Skipped | 0 s
chronik_blocks.py                          | ○ Skipped | 0 s
chronik_chronik_info.py                    | ○ Skipped | 0 s
chronik_disable_token_index.py             | ○ Skipped | 0 s
chronik_disallow_prune.py                  | ○ Skipped | 0 s
chronik_mempool_conflicts.py               | ○ Skipped | 0 s
chronik_pause.py                           | ○ Skipped | 0 s
chronik_plugins_setup.py                   | ○ Skipped | 0 s
chronik_raw_tx.py                          | ○ Skipped | 0 s
chronik_resync.py                          | ○ Skipped | 0 s
chronik_script_confirmed_txs.py            | ○ Skipped | 0 s
chronik_script_history.py                  | ○ Skipped | 0 s
chronik_script_unconfirmed_txs.py          | ○ Skipped | 0 s
chronik_script_utxos.py                    | ○ Skipped | 0 s
chronik_serve.py                           | ○ Skipped | 0 s
chronik_spent_by.py                        | ○ Skipped | 0 s
chronik_token_alp.py                       | ○ Skipped | 0 s
chronik_token_broadcast_txs.py             | ○ Skipped | 0 s
chronik_token_burn.py                      | ○ Skipped | 0 s
chronik_token_id_group.py                  | ○ Skipped | 0 s
chronik_token_parse_failure.py             | ○ Skipped | 0 s
chronik_token_script_group.py              | ○ Skipped | 0 s
chronik_token_slp_fungible.py              | ○ Skipped | 0 s
chronik_token_slp_mint_vault.py            | ○ Skipped | 0 s
chronik_token_slp_nft1.py                  | ○ Skipped | 0 s
chronik_tx.py                              | ○ Skipped | 0 s
chronik_tx_removal_order.py                | ○ Skipped | 0 s
chronik_ws.py                              | ○ Skipped | 0 s
chronik_ws_ordering.py                     | ○ Skipped | 0 s
chronik_ws_ping.py                         | ○ Skipped | 0 s
chronik_ws_script.py                       | ○ Skipped | 0 s
feature_bind_port_discover.py              | ○ Skipped | 0 s
feature_bind_port_externalip.py            | ○ Skipped | 0 s
interface_usdt_net.py                      | ○ Skipped | 0 s
interface_usdt_utxocache.py                | ○ Skipped | 0 s
interface_usdt_validation.py               | ○ Skipped | 0 s

ALL                                        | ✓ Passed  | 1796 s (accumulated) 
Runtime: 360 s

ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1
PiRK updated this revision to Diff 46387.Mar 22 2024, 16:07
PiRK edited the summary of this revision. (Show Details)
PiRK added a parent revision: D15755: Remove ::IsStandardTx(tx, reason) alias.

rebase

PiRK published this revision for review.Mar 22 2024, 16:07
PiRK removed a parent revision: D15756: Remove ::dustRelayFee global.
Harbormaster completed remote builds in B27996: Diff 46387.Mar 22 2024, 16:50
PiRK added a child revision: D15777: Remove ::GetVirtualTransactionSize() alias.Mar 25 2024, 09:23
Fabien accepted this revision.Mar 25 2024, 09:58
This revision is now accepted and ready to land.Mar 25 2024, 09:58
Closed by commit rABCfb43a8161191: Remove ::fIsBareMultisigStd global (authored by MacroFake <falke.marco@gmail.com>, committed by PiRK). · Explain WhyMar 25 2024, 13:45
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABCfb43a8161191: Remove ::fIsBareMultisigStd global.

Revision Contents
Changeset List

PathSize
src/
2 lines
kernel/
1 line
4 lines
policy/
1 line
1 line
1 line
1 line
3 lines

Diff 46387

View Options

src/init.cpp

Loading...
View Options

src/kernel/mempool_options.h

Loading...
View Options

src/mempool_args.cpp

Loading...
View Options

src/policy/settings.h

Loading...
View Options

src/policy/settings.cpp

Loading...
View Options

src/txmempool.h

Loading...
View Options

src/txmempool.cpp

Loading...
View Options

src/validation.cpp

Loading...