Merge remote-tracking branch 'origin/master' into peter/improve-lint

Author: peterargue

.dockerignore

@@ -1,3 +1,7 @@
+# Do not copy the user's project git directory into the container
+# it's not needed to build the project, and causes issues when working within git worktrees
+.git/
+
 integration/localnet/bootstrap/
 integration/localnet/profiler/
 integration/localnet/data/

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ on:
       - master
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
@@ -239,7 +239,7 @@ jobs:
       timeout-minutes: 1
       continue-on-error: true
       with:
-        file: ./coverage.txt
+        files: ./coverage.txt
         flags: unittests
         name: codecov-umbrella
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -285,7 +285,7 @@ jobs:
         timeout-minutes: 1
         continue-on-error: true
         with:
-          file: ./coverage.txt
+          files: ./coverage.txt
           flags: unittests
           name: codecov-umbrella
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -389,7 +389,7 @@ jobs:
         timeout-minutes: 1
         continue-on-error: true
         with:
-          file: ./coverage.txt
+          files: ./coverage.txt
           flags: unittests
           name: codecov-umbrella
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/flaky-test-monitor.yml

@@ -13,7 +13,7 @@ permissions:
   contents: read
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
   BIGQUERY_DATASET: dev_src_flow_test_metrics
   BIGQUERY_TABLE: skipped_tests
   BIGQUERY_TABLE2: test_results

.github/workflows/image_builds.yml

@@ -16,7 +16,7 @@ on:
         type: string
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
   PRIVATE_REGISTRY_HOST: us-central1-docker.pkg.dev
 
 jobs:

.github/workflows/stale.yml

@@ -7,11 +7,12 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           days-before-issue-stale: 90
           days-before-issue-close: 7
           exempt-issue-labels: 'Preserve,Idea'
+          exempt-pr-labels: 'Preserve'
           stale-issue-label: 'Stale'
           stale-issue-message: >
             This issue has been automatically marked as stale because it has not had

.github/workflows/tools.yml

@@ -14,7 +14,7 @@ on:
         type: boolean
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
 
 jobs:
   build-publish:

.gitignore

@@ -3,7 +3,6 @@
 /cmd/consensus/consensus
 /cmd/execution/execution
 /cmd/verification/verification
-/cmd/testclient/testclient
 /cmd/util/util
 /cmd/bootstrap/bootstrap
 

.mockery.yaml

@@ -0,0 +1,113 @@
+dir: "{{.InterfaceDir}}/mock"
+outpkg: "mock"
+filename: "{{.InterfaceName | snakecase}}.go"
+mockname: "{{.InterfaceName}}"
+
+all: True
+with-expecter: False
+include-auto-generated: False
+disable-func-mocks: True
+fail-on-missing: True
+
+# Suppress warnings
+issue-845-fix: True
+disable-version-string: True
+resolve-type-alias: False
+
+packages:
+  github.com/onflow/flow-go/access:
+  github.com/onflow/flow-go/access/validator:
+  github.com/onflow/flow-go/cmd/util/ledger/reporters:
+  github.com/onflow/flow-go/consensus/hotstuff:
+    config:
+      dir: "consensus/hotstuff/mocks"
+      outpkg: "mocks"
+  github.com/onflow/flow-go/engine/access/ingestion/tx_error_messages:
+  github.com/onflow/flow-go/engine/access/rest/common/models:
+  github.com/onflow/flow-go/engine/access/rest/websockets:
+  github.com/onflow/flow-go/engine/access/rest/websockets/data_providers:
+  github.com/onflow/flow-go/engine/access/rpc/backend/accounts/provider:
+  github.com/onflow/flow-go/engine/access/rpc/backend/events/provider:
+  github.com/onflow/flow-go/engine/access/rpc/backend/node_communicator:
+  github.com/onflow/flow-go/engine/access/rpc/backend/transactions/error_messages:
+  github.com/onflow/flow-go/engine/access/rpc/backend/transactions/provider:
+  github.com/onflow/flow-go/engine/access/rpc/backend/transactions/retrier:
+  github.com/onflow/flow-go/engine/access/rpc/connection:
+  github.com/onflow/flow-go/engine/access/state_stream:
+  github.com/onflow/flow-go/engine/access/subscription:
+  github.com/onflow/flow-go/engine/access/subscription/tracker:
+  github.com/onflow/flow-go/engine/access/wrapper:
+    config:
+      dir: "engine/access/mock"
+  github.com/onflow/flow-go/engine/collection:
+  github.com/onflow/flow-go/engine/collection/epochmgr:
+  github.com/onflow/flow-go/engine/collection/rpc:
+  github.com/onflow/flow-go/engine/common/follower:
+    interfaces:
+      complianceCore:
+        config:
+          exported: true
+          mockname:  "{{.InterfaceName | firstUpper}}"
+  github.com/onflow/flow-go/engine/common/follower/cache:
+  github.com/onflow/flow-go/engine/consensus:
+  github.com/onflow/flow-go/engine/consensus/approvals:
+  github.com/onflow/flow-go/engine/execution:
+  github.com/onflow/flow-go/engine/execution/computation:
+  github.com/onflow/flow-go/engine/execution/computation/computer:
+  github.com/onflow/flow-go/engine/execution/computation/query:
+  github.com/onflow/flow-go/engine/execution/ingestion/uploader:
+  github.com/onflow/flow-go/engine/execution/provider:
+  github.com/onflow/flow-go/engine/execution/state:
+  github.com/onflow/flow-go/engine/protocol:
+  github.com/onflow/flow-go/engine/verification/fetcher:
+  github.com/onflow/flow-go/fvm:
+  github.com/onflow/flow-go/fvm/environment:
+  github.com/onflow/flow-go/fvm/storage/snapshot:
+  github.com/onflow/flow-go/insecure:
+  github.com/onflow/flow-go/ledger:
+  github.com/onflow/flow-go/model/fingerprint:
+  github.com/onflow/flow-go/module:
+  github.com/onflow/flow-go/module/component:
+  github.com/onflow/flow-go/module/execution:
+  github.com/onflow/flow-go/module/executiondatasync/execution_data:
+  github.com/onflow/flow-go/module/executiondatasync/optimistic_sync:
+    config:
+      all: False
+    interfaces:
+      Core:
+  github.com/onflow/flow-go/module/executiondatasync/tracker:
+  github.com/onflow/flow-go/module/forest:
+  github.com/onflow/flow-go/module/mempool:
+  github.com/onflow/flow-go/module/mempool/consensus/mock_interfaces:
+    config:
+      dir: "module/mempool/consensus/mock"
+  github.com/onflow/flow-go/module/state_synchronization:
+  github.com/onflow/flow-go/module/state_synchronization/requester:
+  github.com/onflow/flow-go/network:
+  github.com/onflow/flow-go/network/alsp:
+  github.com/onflow/flow-go/network/p2p:
+  github.com/onflow/flow-go/state/cluster:
+  github.com/onflow/flow-go/state/protocol:
+  github.com/onflow/flow-go/state/protocol/events:
+  github.com/onflow/flow-go/state/protocol/protocol_state:
+  github.com/onflow/flow-go/state/protocol/protocol_state/mock_interfaces:
+    config:
+      dir: "state/protocol/protocol_state/mock"
+  github.com/onflow/flow-go/state/protocol/protocol_state/epochs:
+  github.com/onflow/flow-go/state/protocol/protocol_state/epochs/mock_interfaces:
+    config:
+      dir: "state/protocol/protocol_state/epochs/mock"
+  github.com/onflow/flow-go/storage:
+
+  # external libraries
+  github.com/onflow/flow-go-sdk/access:
+    config:
+      dir: "integration/benchmark/mock"
+    interfaces:
+      Client:
+
+  github.com/onflow/crypto:
+    config:
+      dir: "module/mock"
+    interfaces:
+      PublicKey:

docs/CodingConventions.md CodingConventions.mddocs/CodingConventions.md renamed to CodingConventions.md

@@ -77,8 +77,7 @@ unittest-main:
 .PHONY: install-mock-generators
 install-mock-generators:
 	cd ${GOPATH}; \
-    go install github.com/vektra/mockery/[email protected]; \
-    go install github.com/golang/mock/[email protected];
+    go install github.com/vektra/mockery/[email protected];
 
 .PHONY: install-tools
 install-tools: check-go-version install-mock-generators
@@ -154,92 +153,15 @@ generate-fvm-env-wrappers:
 
 .PHONY: generate-mocks
 generate-mocks: install-mock-generators
-	mockery --name '(Connector|PingInfoProvider)' --dir=network/p2p --case=underscore --output="./network/mocknetwork" --outpkg="mocknetwork"
-	CGO_CFLAGS=$(CRYPTO_FLAG) mockgen -destination=network/mocknetwork/mock_network.go -package=mocknetwork github.com/onflow/flow-go/network EngineRegistry
-	mockery --name=ExecutionDataStore --dir=module/executiondatasync/execution_data --case=underscore --output="./module/executiondatasync/execution_data/mock" --outpkg="mock"
-	mockery --name=Downloader --dir=module/executiondatasync/execution_data --case=underscore --output="./module/executiondatasync/execution_data/mock" --outpkg="mock"
-	mockery --name='.*' --dir=integration/benchmark/mocksiface --case=underscore --output="integration/benchmark/mock" --outpkg="mock"
-	mockery --name '(ExecutionDataRequester|IndexReporter)' --dir=module/state_synchronization --case=underscore --output="./module/state_synchronization/mock" --outpkg="state_synchronization"
-	mockery --name 'ExecutionState' --dir=engine/execution/state --case=underscore --output="engine/execution/state/mock" --outpkg="mock"
-	mockery --name 'BlockComputer' --dir=engine/execution/computation/computer --case=underscore --output="engine/execution/computation/computer/mock" --outpkg="mock"
-	mockery --name 'ComputationManager' --dir=engine/execution/computation --case=underscore --output="engine/execution/computation/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/execution/computation/query --case=underscore --output="engine/execution/computation/query/mock" --outpkg="mock"
-	mockery --name 'EpochComponentsFactory' --dir=engine/collection/epochmgr --case=underscore --output="engine/collection/epochmgr/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/execution/ --case=underscore --output="engine/execution/mock" --outpkg="mock"
-	mockery --name 'Backend' --dir=engine/collection/rpc --case=underscore --output="engine/collection/rpc/mock" --outpkg="mock"
-	mockery --name 'ProviderEngine' --dir=engine/execution/provider --case=underscore --output="engine/execution/provider/mock" --outpkg="mock"
-	mockery --name '.*' --dir=state/cluster --case=underscore --output="state/cluster/mock" --outpkg="mock"
-	mockery --name '.*' --dir=module --case=underscore --output="./module/mock" --outpkg="mock"
-	mockery --name '.*' --dir=module/mempool --case=underscore --output="./module/mempool/mock" --outpkg="mempool"
-	mockery --name '.*' --dir=module/component --case=underscore --output="./module/component/mock" --outpkg="component"
-	mockery --name '.*' --dir=network --case=underscore --output="./network/mocknetwork" --outpkg="mocknetwork"
-	mockery --name '.*' --dir=storage --case=underscore --output="./storage/mock" --outpkg="mock"
-	mockery --name 'DeferredDBUpdate' --dir=storage/badger/transaction --case=underscore --output="storage/mock" --outpkg="mock"
-	mockery --name '.*' --dir="state/protocol" --case=underscore --output="state/protocol/mock" --outpkg="mock"
-	mockery --name '.*' --dir="state/protocol/events" --case=underscore --output="./state/protocol/events/mock" --outpkg="mock"
-	mockery --name '.*' --dir="state/protocol/protocol_state" --case=underscore --output="state/protocol/protocol_state/mock" --outpkg="mock"
-	mockery --name '.*' --dir="state/protocol/protocol_state/epochs" --case=underscore --output="state/protocol/protocol_state/epochs/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/execution/computation/computer --case=underscore --output="./engine/execution/computation/computer/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/execution/state --case=underscore --output="./engine/execution/state/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/collection --case=underscore --output="./engine/collection/mock" --outpkg="mock"
-	mockery --name 'complianceCore' --dir=engine/common/follower --exported --case=underscore --output="./engine/common/follower/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/common/follower/cache --case=underscore --output="./engine/common/follower/cache/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/consensus --case=underscore --output="./engine/consensus/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/consensus/approvals --case=underscore --output="./engine/consensus/approvals/mock" --outpkg="mock"
-	rm -rf ./fvm/mock
-	mockery --name '.*' --dir=fvm --case=underscore --output="./fvm/mock" --outpkg="mock"
-	rm -rf ./fvm/environment/mock
-	mockery --name '.*' --dir=fvm/environment --case=underscore --output="./fvm/environment/mock" --outpkg="mock"
-	mockery --name '.*' --dir=ledger --case=underscore --output="./ledger/mock" --outpkg="mock"
-	mockery --name 'ViolationsConsumer' --dir=network --case=underscore --output="./network/mocknetwork" --outpkg="mocknetwork"
-	mockery --name '.*' --dir=network/p2p/ --case=underscore --output="./network/p2p/mock" --outpkg="mockp2p"
-	mockery --name '.*' --dir=network/alsp --case=underscore --output="./network/alsp/mock" --outpkg="mockalsp"
-	mockery --name 'Vertex' --dir="./module/forest" --case=underscore --output="./module/forest/mock" --outpkg="mock"
-	mockery --name '.*' --dir="./consensus/hotstuff" --case=underscore --output="./consensus/hotstuff/mocks" --outpkg="mocks"
-	mockery --name '.*' --dir="./engine/access/wrapper" --case=underscore --output="./engine/access/mock" --outpkg="mock"
-	mockery --name 'API' --dir="./access" --case=underscore --output="./access/mock" --outpkg="mock"
-	mockery --name 'Blocks' --dir="./access/validator" --case=underscore --output="./access/validator/mock" --outpkg="mock"
-	mockery --name 'API' --dir="./engine/protocol" --case=underscore --output="./engine/protocol/mock" --outpkg="mock"
-	mockery --name '.*' --dir="./engine/access/state_stream" --case=underscore --output="./engine/access/state_stream/mock" --outpkg="mock"
-	mockery --name 'BlockTracker' --dir="./engine/access/subscription/tracker" --case=underscore --output="./engine/access/subscription/tracker/mock"  --outpkg="mock"
-	mockery --name 'ExecutionDataTracker' --dir="./engine/access/subscription/tracker" --case=underscore --output="./engine/access/subscription/tracker/mock"  --outpkg="mock"
-	mockery --name 'DataProvider' --dir="./engine/access/rest/websockets/data_providers" --case=underscore --output="./engine/access/rest/websockets/data_providers/mock"  --outpkg="mock"
-	mockery --name 'DataProviderFactory' --dir="./engine/access/rest/websockets/data_providers" --case=underscore --output="./engine/access/rest/websockets/data_providers/mock"  --outpkg="mock"
-	mockery --name 'LinkGenerator' --dir="./engine/access/rest/common/models" --case=underscore --output="./engine/access/rest/common/models/mock"  --outpkg="mock"
-	mockery --name 'WebsocketConnection' --dir="./engine/access/rest/websockets" --case=underscore --output="./engine/access/rest/websockets/mock"  --outpkg="mock"
-	mockery --name 'ConnectionFactory' --dir="./engine/access/rpc/connection" --case=underscore --output="./engine/access/rpc/connection/mock" --outpkg="mock"
-	mockery --name 'Communicator' --dir="./engine/access/rpc/backend/node_communicator" --case=underscore --output="./engine/access/rpc/backend/node_communicator/mock" --outpkg="mock"
-	mockery --name 'AccountProvider' --dir="./engine/access/rpc/backend/accounts/provider" --case=underscore --output="./engine/access/rpc/backend/accounts/provider/mock" --outpkg="mock"
-	mockery --name 'EventProvider' --dir="./engine/access/rpc/backend/events/provider" --case=underscore --output="./engine/access/rpc/backend/events/provider/mock" --outpkg="mock"
-	mockery --name 'TransactionProvider' --dir="./engine/access/rpc/backend/transactions/provider" --case=underscore --output="./engine/access/rpc/backend/transactions/provider/mock" --outpkg="mock"
-	mockery --name 'Provider' --dir="./engine/access/rpc/backend/transactions/error_messages" --case=underscore --output="./engine/access/rpc/backend/transactions/error_messages/mock" --outpkg="mock"
-	mockery --name 'TransactionSender' --dir="./engine/access/rpc/backend/transactions/retrier" --case=underscore --output="./engine/access/rpc/backend/transactions/retrier/mock" --outpkg="mock"
-	mockery --name 'Retrier' --dir="./engine/access/rpc/backend/transactions/retrier" --case=underscore --output="./engine/access/rpc/backend/transactions/retrier/mock" --outpkg="mock"
-	mockery --name '.*' --dir=model/fingerprint --case=underscore --output="./model/fingerprint/mock" --outpkg="mock"
-	mockery --name 'ExecForkActor' --structname 'ExecForkActorMock' --dir=module/mempool/consensus/mock/ --case=underscore --output="./module/mempool/consensus/mock/" --outpkg="mock"
-	mockery --name '.*' --dir=engine/verification/fetcher/ --case=underscore --output="./engine/verification/fetcher/mock" --outpkg="mockfetcher"
-	mockery --name '.*' --dir=./cmd/util/ledger/reporters --case=underscore --output="./cmd/util/ledger/reporters/mock" --outpkg="mock"
-	mockery --name 'Storage' --dir=module/executiondatasync/tracker --case=underscore --output="module/executiondatasync/tracker/mock" --outpkg="mocktracker"
-	mockery --name 'ScriptExecutor' --dir=module/execution --case=underscore --output="module/execution/mock" --outpkg="mock"
-	mockery --name 'StorageSnapshot' --dir=fvm/storage/snapshot --case=underscore --output="fvm/storage/snapshot/mock" --outpkg="mock"
-	mockery --name 'Core' --dir=module/executiondatasync/optimistic_sync --case=underscore --output="module/executiondatasync/optimistic_sync/mock" --outpkg="mock"
-	mockery --name 'Requester' --dir=engine/access/ingestion/tx_error_messages --case=underscore --output="engine/access/ingestion/tx_error_messages/mock" --outpkg="mock"
-	mockery --name 'ExecutionDataRequester' --dir=module/state_synchronization/requester --case=underscore --output="module/state_synchronization/requester/mock" --outpkg="mock"
-
-	#temporarily make insecure/ a non-module to allow mockery to create mocks
-	mv insecure/go.mod insecure/go2.mod
-	if [ -f go.work ]; then mv go.work go2.work; fi
-	mockery --name '.*' --dir=insecure/ --case=underscore --output="./insecure/mock"  --outpkg="mockinsecure"
-	mv insecure/go2.mod insecure/go.mod
-	if [ -f go2.work ]; then mv go2.work go.work; fi
+	mockery --config .mockery.yaml
+	cd insecure; mockery --config .mockery.yaml
 
 # this ensures there is no unused dependency being added by accident
 .PHONY: tidy
 tidy:
 	go mod tidy -v
 	cd integration; go mod tidy -v
 	cd crypto; go mod tidy -v
-	cd cmd/testclient; go mod tidy -v
 	cd insecure; go mod tidy -v
 	git diff --exit-code