Merge bitcoin/bitcoin#34816: test: Remove vulture from ci, Remove some --min-confidence=60 unused code

fa90b21430 test: Remove unused feature_segwit.py functions (MarcoFalke) fa6b05c96f test: Remove unused CUSTOM_._COUNT (MarcoFalke) fa7bac94d8 test: Remove unused wait_for_addr, firstAddrnServices, on_addr (MarcoFalke) fa388a3585 test: Remove unused self.p2p_conn_index = 1 (MarcoFalke) fa803710e2 test: Remove unused AddressType (MarcoFalke) fab5072ce1 ci: Remove vulture (MarcoFalke) Pull request description: Currently, `vulture` is run with `--min-confidence=100`, which reduces its checks to dead code after control statements, which is nice, but not really a common nor severe issue. See the discussion in https://github.com/bitcoin/bitcoin/issues/34810#issuecomment-4045927137 and commit 5c005363a8, which had to remove dead code manually. Reducing the confidence has shown to be too brittle/tedious in the past, so remove the tool for now from CI. Of course, removing this from CI does not prevent anyone from running it locally and removing dead code. Fixes https://github.com/bitcoin/bitcoin/issues/34810 ACKs for top commit: fanquake: ACK fa90b21430 willcl-ark: ACK fa90b21430 Tree-SHA512: 6a5998470dae3a17baec29b70b02333f4cd9b81bc4c6a05b56085ff1ba527ed7bdeccd17b09d9ad785ae03c97982ee1f3147e4df3bd537c66b02e9a44d0e5f15
2026-04-13 17:18:00 +02:00 · 2026-03-16 12:46:50 +08:00
parent 92a3d30f38 fa90b21430
commit ff7cdf633e
8 changed files with 1 additions and 127 deletions
--- a/ci/lint/01_install.sh
+++ b/ci/lint/01_install.sh
@@ -44,8 +44,7 @@ ${CI_RETRY_EXE} pip3 install \
  lief==0.16.6 \
  mypy==1.19.1 \
  pyzmq==27.1.0 \
-  ruff==0.15.5 \
-  vulture==2.14
+  ruff==0.15.5

 SHELLCHECK_VERSION=v0.11.0
 curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | \
--- a/test/functional/feature_segwit.py
+++ b/test/functional/feature_segwit.py
@@ -29,11 +29,7 @@ from test_framework.script import (
    OP_TRUE,
 )
 from test_framework.script_util import (
-    key_to_p2pk_script,
-    key_to_p2wpkh_script,
    keys_to_multisig_script,
-    script_to_p2sh_script,
-    script_to_p2wsh_script,
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -67,9 +63,6 @@ def find_spendable_utxo(node, min_value):
    raise AssertionError(f"Unspent output equal or higher than {min_value} not found")


-txs_mined = {}  # txindex from txid to blockhash
-
-
 class SegWitTest(BitcoinTestFramework):
    def set_test_params(self):
        self.setup_clean_chain = True
@@ -298,64 +291,6 @@ class SegWitTest(BitcoinTestFramework):
        # Mine a block to clear the gbt cache again.
        self.generate(self.nodes[0], 1)

-    def mine_and_test_listunspent(self, script_list, ismine):
-        utxo = find_spendable_utxo(self.nodes[0], 50)
-        tx = CTransaction()
-        tx.vin.append(CTxIn(COutPoint(int('0x' + utxo['txid'], 0), utxo['vout'])))
-        for i in script_list:
-            tx.vout.append(CTxOut(10000000, i))
-        signresults = self.nodes[0].signrawtransactionwithwallet(tx.serialize_without_witness().hex())['hex']
-        txid = self.nodes[0].sendrawtransaction(hexstring=signresults, maxfeerate=0)
-        txs_mined[txid] = self.generate(self.nodes[0], 1)[0]
-        watchcount = 0
-        spendcount = 0
-        for i in self.nodes[0].listunspent():
-            if i['txid'] == txid:
-                watchcount += 1
-                if i['spendable']:
-                    spendcount += 1
-        if ismine == 2:
-            assert_equal(spendcount, len(script_list))
-        elif ismine == 1:
-            assert_equal(watchcount, len(script_list))
-            assert_equal(spendcount, 0)
-        else:
-            assert_equal(watchcount, 0)
-        return txid
-
-    def p2sh_address_to_script(self, v):
-        bare = CScript(bytes.fromhex(v['hex']))
-        p2sh = CScript(bytes.fromhex(v['scriptPubKey']))
-        p2wsh = script_to_p2wsh_script(bare)
-        p2sh_p2wsh = script_to_p2sh_script(p2wsh)
-        return [bare, p2sh, p2wsh, p2sh_p2wsh]
-
-    def p2pkh_address_to_script(self, v):
-        pubkey = bytes.fromhex(v['pubkey'])
-        p2wpkh = key_to_p2wpkh_script(pubkey)
-        p2sh_p2wpkh = script_to_p2sh_script(p2wpkh)
-        p2pk = key_to_p2pk_script(pubkey)
-        p2pkh = CScript(bytes.fromhex(v['scriptPubKey']))
-        p2sh_p2pk = script_to_p2sh_script(p2pk)
-        p2sh_p2pkh = script_to_p2sh_script(p2pkh)
-        p2wsh_p2pk = script_to_p2wsh_script(p2pk)
-        p2wsh_p2pkh = script_to_p2wsh_script(p2pkh)
-        p2sh_p2wsh_p2pk = script_to_p2sh_script(p2wsh_p2pk)
-        p2sh_p2wsh_p2pkh = script_to_p2sh_script(p2wsh_p2pkh)
-        return [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh]
-
-    def create_and_mine_tx_from_txids(self, txids, success=True):
-        tx = CTransaction()
-        for i in txids:
-            txraw = self.nodes[0].getrawtransaction(i, 0, txs_mined[i])
-            txtmp = tx_from_hex(txraw)
-            for j in range(len(txtmp.vout)):
-                tx.vin.append(CTxIn(COutPoint(int('0x' + i, 0), j)))
-        tx.vout.append(CTxOut(0, CScript()))
-        signresults = self.nodes[0].signrawtransactionwithwallet(tx.serialize_without_witness().hex())['hex']
-        self.nodes[0].sendrawtransaction(hexstring=signresults, maxfeerate=0)
-        self.generate(self.nodes[0], 1)
-

 if __name__ == '__main__':
    SegWitTest(__file__).main()
--- a/test/functional/mempool_updatefromblock.py
+++ b/test/functional/mempool_updatefromblock.py
@@ -19,9 +19,6 @@ from test_framework.mempool_util import DEFAULT_CLUSTER_LIMIT

 MAX_DISCONNECTED_TX_POOL_BYTES = 20_000_000

-CUSTOM_ANCESTOR_COUNT = 100
-CUSTOM_DESCENDANT_COUNT = CUSTOM_ANCESTOR_COUNT
-
 class MempoolUpdateFromBlockTest(BitcoinTestFramework):
    def set_test_params(self):
        self.num_nodes = 1
--- a/test/functional/p2p_node_network_limited.py
+++ b/test/functional/p2p_node_network_limited.py
@@ -28,15 +28,9 @@ from test_framework.util import (
 NODE_NETWORK_LIMITED_MIN_BLOCKS = 288

 class P2PIgnoreInv(P2PInterface):
-    firstAddrnServices = 0
    def on_inv(self, message):
        # The node will send us invs for other blocks. Ignore them.
        pass
-    def on_addr(self, message):
-        self.firstAddrnServices = message.addrs[0].nServices
-    def wait_for_addr(self, timeout=5):
-        test_function = lambda: self.last_message.get("addr")
-        self.wait_until(test_function, timeout=timeout)
    def send_getdata_for_block(self, blockhash):
        getdata_request = msg_getdata()
        getdata_request.inv.append(CInv(MSG_BLOCK, int(blockhash, 16)))
--- a/test/functional/test_framework/address.py
+++ b/test/functional/test_framework/address.py
@@ -8,7 +8,6 @@
 - bech32 segwit v0 P2WPKH and P2WSH addresses.
 - bech32m segwit v1 P2TR addresses."""

-import enum
 import unittest

 from .script import (
@@ -37,13 +36,6 @@ ADDRESS_BCRT1_UNSPENDABLE_DESCRIPTOR = 'addr(bcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
 # Coins sent to this address can be spent with a witness stack of just OP_TRUE
 ADDRESS_BCRT1_P2WSH_OP_TRUE = 'bcrt1qft5p2uhsdcdc3l2ua4ap5qqfg4pjaqlp250x7us7a8qqhrxrxfsqseac85'

-
-class AddressType(enum.Enum):
-    bech32 = 'bech32'
-    p2sh_segwit = 'p2sh-segwit'
-    legacy = 'legacy'  # P2PKH
-
-
 b58chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'


--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -120,7 +120,6 @@ class TestNode():
        """

        self.index = i
-        self.p2p_conn_index = 1
        self.datadir_path = datadir_path
        self.bitcoinconf = self.datadir_path / "bitcoin.conf"
        self.stdout_dir = self.datadir_path / "stdout"
--- a/test/lint/README.md
+++ b/test/lint/README.md
@@ -52,7 +52,6 @@ or `--help`:
 | [`lint-python.py`](/test/lint/lint-python.py) | [lief](https://github.com/lief-project/LIEF)
 | [`lint-python.py`](/test/lint/lint-python.py) | [mypy](https://github.com/python/mypy)
 | [`lint-python.py`](/test/lint/lint-python.py) | [pyzmq](https://github.com/zeromq/pyzmq)
-| [`lint-python-dead-code.py`](/test/lint/lint-python-dead-code.py) | [vulture](https://github.com/jendrikseipp/vulture)
 | [`lint-shell.py`](/test/lint/lint-shell.py) | [ShellCheck](https://github.com/koalaman/shellcheck)
 | `py_lint` | [ruff](https://github.com/astral-sh/ruff)
 | markdown link check | [mlc](https://github.com/becheran/mlc)
--- a/test/lint/lint-python-dead-code.py
+++ b/test/lint/lint-python-dead-code.py
@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2022-present The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-"""
-Find dead Python code.
-"""
-
-from subprocess import check_output, STDOUT, CalledProcessError
-
-FILES_ARGS = ['git', 'ls-files', '--', '*.py']
-
-
-def check_vulture_install():
-    try:
-        check_output(["vulture", "--version"])
-    except FileNotFoundError:
-        print("Skipping Python dead code linting since vulture is not installed. Install by running \"pip3 install vulture\"")
-        exit(0)
-
-
-def main():
-    check_vulture_install()
-
-    files = check_output(FILES_ARGS, text=True).splitlines()
-    # --min-confidence 100 will only report code that is guaranteed to be unused within the analyzed files.
-    # Any value below 100 introduces the risk of false positives, which would create an unacceptable maintenance burden.
-    vulture_args = ['vulture', '--min-confidence=100'] + files
-
-    try:
-        check_output(vulture_args, stderr=STDOUT, text=True)
-    except CalledProcessError as e:
-        print(e.output, end="")
-        print("Python dead code detection found some issues")
-        exit(1)
-
-
-if __name__ == "__main__":
-    main()