From dbfa92990afc5d8099bcf4f17c585ff8b7997b78 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 15 Feb 2021 15:13:53 +0100 Subject: [PATCH] Merge #21096: Re-add dead code detection 3f8776a1391c3978ed66144df15fd9bcb9edd35d Re-add dead code detection (flack) Pull request description: This re-adds unreachable code detection for Python based on `vulture`. Effectively, this reverts f4beb4996d27f2cdaf4f0a63e7dc044bf17decce. The difference to the previous version is that this runs with the `--min-confidence 100` setting. From https://pypi.org/project/vulture/: > Use `--min-confidence 100` to only report code that is guaranteed to be unused within the analyzed files. So this should avoid the previous issues where static analysis had wrong positives due to the dynamic nature of Python code by only reporting things that are unambiguous (such as code after a `return` statement). As such, there is not suppressions list. My motivation was mainly #21081 which would have been caught by this (as can be seen by the CI run failing). This is still marked as draft because #21081 is needed to get the linter to pass. Also, there is a second problem that this found (see https://github.com/bitcoin/bitcoin/pull/19509/files#r571454691). From what I can tell, this is a spurious type comment that could just be removed (or if that line has no side effects it could also be deleted altogether?). I could add a commit here to fix it, but I wanted to see if there is interest in having this linter again in the first place ACKs for top commit: practicalswift: ACK 3f8776a1391c3978ed66144df15fd9bcb9edd35d Tree-SHA512: 52314ad4f627d969de1eb15375ca677ed86a2e816fe773756a1ce22421214ba407b5a09a4bf701a3aab1a10c7b336f548e4cef3327edf154acba55e987db21f6 --- .travis/lint_04_install.sh | 1 + ci/Dockerfile.builder | 1 + test/lint/lint-python-dead-code.sh | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100755 test/lint/lint-python-dead-code.sh diff --git a/.travis/lint_04_install.sh b/.travis/lint_04_install.sh index e4d68d8e3c..e9ddfe6288 100755 --- a/.travis/lint_04_install.sh +++ b/.travis/lint_04_install.sh @@ -8,6 +8,7 @@ export LC_ALL=C travis_retry pip3 install codespell==1.15.0 travis_retry pip3 install flake8==3.5.0 +travis_retry pip3 install vulture==2.3 travis_retry pip3 install yq SHELLCHECK_VERSION=v0.6.0 diff --git a/ci/Dockerfile.builder b/ci/Dockerfile.builder index 4f06d2fa3d..c75074f6a4 100644 --- a/ci/Dockerfile.builder +++ b/ci/Dockerfile.builder @@ -17,6 +17,7 @@ RUN pip3 install pyzmq # really needed? RUN pip3 install jinja2 RUN pip3 install flake8==3.5.0 RUN pip3 install codespell==1.15.0 +RUN pip3 install vulture==2.3 RUN pip3 install yq # dash_hash diff --git a/test/lint/lint-python-dead-code.sh b/test/lint/lint-python-dead-code.sh new file mode 100755 index 0000000000..c3b6ff3c98 --- /dev/null +++ b/test/lint/lint-python-dead-code.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2021 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. + +export LC_ALL=C + +if ! command -v vulture > /dev/null; then + echo "Skipping Python dead code linting since vulture is not installed. Install by running \"pip3 install vulture\"" + exit 0 +fi + +# --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. +if ! vulture \ + --min-confidence 100 \ + $(git ls-files -- "*.py"); then + echo "Python dead code detection found some issues" + exit 1 +fi