Rework regex matching for lint_allowed_geth_imports.sh

ava-labs · Feb 17, 2025 · e389c7f · e389c7f
1 parent a4eaf83
commit e389c7f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/scripts/geth-allowed-packages.txt b/scripts/geth-allowed-packages.txt
@@ -18,5 +18,4 @@
 "github.com/ethereum/go-ethereum/event"
 "github.com/ethereum/go-ethereum/log"
 "github.com/ethereum/go-ethereum/metrics"
-"github.com/ethereum/go-ethereum/metrics.(*meterArbiter).tick"
 "github.com/ethereum/go-ethereum/rlp"
diff --git a/scripts/lint_allowed_geth_imports.sh b/scripts/lint_allowed_geth_imports.sh
@@ -8,7 +8,7 @@ set -o pipefail
 # 1. Recursively search through all go files for any lines that include a direct import from go-ethereum
 # 2. Sort the unique results
 # #. Print out the difference between the search results and the list of specified allowed package imports from geth.
-extra_imports=$(grep -r --include='*.go' --exclude-dir='simulator' '"github.com/ethereum/go-ethereum/.*"' -o -h | sort -u | comm -23 - ./scripts/geth-allowed-packages.txt)
+extra_imports=$(grep -r --include='*.go' --exclude-dir='simulator' -E '"github.com/ethereum/go-ethereum/[a-z0-9_/]+"' -o -h | sort -u | comm -23 - ./scripts/geth-allowed-packages.txt)
 if [ -n "${extra_imports}" ]; then
     echo "new go-ethereum imports should be added to ./scripts/geth-allowed-packages.txt to prevent accidental imports:"
     echo "${extra_imports}"