From 8c723edb9cfdb61e5831115735aa9a9a74fce8ae Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 6 Nov 2025 04:04:18 +0000 Subject: [PATCH] [tooling] Update to use go tool for mockgen and canoto --- Taskfile.yml | 4 ++-- chains/atomic/mocks_generate_test.go | 2 +- codec/mocks_generate_test.go | 2 +- database/mocks_generate_test.go | 4 ++-- go.mod | 8 ++++++-- message/mocks_generate_test.go | 4 ++-- simplex/block.go | 2 +- simplex/qc.go | 2 +- simplex/storage.go | 2 +- snow/consensus/snowman/mocks_generate_test.go | 2 +- snow/engine/avalanche/vertex/mocks_generate_test.go | 2 +- snow/engine/common/mocks_generate_test.go | 2 +- snow/engine/snowman/block/block_context_vm.go | 2 +- snow/engine/snowman/block/mocks_generate_test.go | 10 +++++----- snow/networking/handler/mocks_generate_test.go | 2 +- snow/networking/router/mocks_generate_test.go | 2 +- snow/networking/sender/mocks_generate_test.go | 2 +- snow/networking/timeout/mocks_generate_test.go | 2 +- snow/networking/tracker/mocks_generate_test.go | 4 ++-- snow/uptime/mocks_generate_test.go | 2 +- snow/validators/mocks_generate_test.go | 2 +- tools.go | 9 --------- utils/filesystem/mocks_generate_test.go | 2 +- utils/hashing/mocks_generate_test.go | 2 +- utils/resource/mocks_generate_test.go | 2 +- vms/avm/block/executor/mocks_generate_test.go | 2 +- vms/avm/block/mocks_generate_test.go | 2 +- vms/avm/metrics/mocks_generate_test.go | 2 +- vms/avm/state/mocks_generate_test.go | 6 +++--- vms/avm/txs/mocks_generate_test.go | 2 +- vms/components/avax/mocks_generate_test.go | 2 +- vms/components/verify/mocks_generate_test.go | 2 +- vms/mocks_generate_test.go | 4 ++-- vms/platformvm/block/executor/mocks_generate_test.go | 2 +- vms/platformvm/block/mocks_generate_test.go | 2 +- vms/platformvm/fx/mocks_generate_test.go | 2 +- vms/platformvm/signer/mocks_generate_test.go | 2 +- vms/platformvm/state/mocks_generate_test.go | 6 +++--- vms/platformvm/utxo/mocks_generate_test.go | 2 +- vms/proposervm/mocks_generate_test.go | 2 +- vms/proposervm/proposer/mocks_generate_test.go | 2 +- vms/registry/mocks_generate_test.go | 4 ++-- 42 files changed, 60 insertions(+), 65 deletions(-) delete mode 100644 tools.go diff --git a/Taskfile.yml b/Taskfile.yml index fa229d51d012..d871e10118b5 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -118,11 +118,11 @@ tasks: desc: Generates testing mocks cmds: - cmd: grep -lr -E '^// Code generated by MockGen\. DO NOT EDIT\.$' . | xargs -r rm - - cmd: go generate -run "go.uber.org/mock/mockgen" ./... + - cmd: go generate -run "mockgen" ./... generate-canoto: desc: Generates canoto - cmd: go generate -run "github.com/StephenButtolph/canoto/canoto" ./... + cmd: go generate -run "canoto" ./... generate-load-contract-bindings: desc: Generates load contract bindings diff --git a/chains/atomic/mocks_generate_test.go b/chains/atomic/mocks_generate_test.go index ff4afb6b1ad9..f19da5525622 100644 --- a/chains/atomic/mocks_generate_test.go +++ b/chains/atomic/mocks_generate_test.go @@ -3,4 +3,4 @@ package atomic -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/shared_memory.go -mock_names=SharedMemory=SharedMemory . SharedMemory +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/shared_memory.go -mock_names=SharedMemory=SharedMemory . SharedMemory diff --git a/codec/mocks_generate_test.go b/codec/mocks_generate_test.go index 10a860646b42..b62f4b74e311 100644 --- a/codec/mocks_generate_test.go +++ b/codec/mocks_generate_test.go @@ -3,4 +3,4 @@ package codec -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager diff --git a/database/mocks_generate_test.go b/database/mocks_generate_test.go index 473a49688b1c..7f16049cbd91 100644 --- a/database/mocks_generate_test.go +++ b/database/mocks_generate_test.go @@ -3,5 +3,5 @@ package database -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/batch.go -mock_names=Batch=Batch . Batch -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/iterator.go -mock_names=Iterator=Iterator . Iterator +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/batch.go -mock_names=Batch=Batch . Batch +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/iterator.go -mock_names=Iterator=Iterator . Iterator diff --git a/go.mod b/go.mod index 376177b2a945..f06498b425f2 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,6 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/crypto v0.43.0 golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e - golang.org/x/mod v0.29.0 golang.org/x/net v0.46.0 golang.org/x/sync v0.17.0 golang.org/x/term v0.36.0 @@ -186,6 +185,7 @@ require ( go.opentelemetry.io/otel/metric v1.37.0 // indirect go.opentelemetry.io/proto/otlp v1.7.0 // indirect go.uber.org/multierr v1.11.0 // indirect + golang.org/x/mod v0.29.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/sys v0.37.0 // indirect golang.org/x/text v0.30.0 // indirect @@ -199,4 +199,8 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -tool github.com/onsi/ginkgo/v2/ginkgo +tool ( + github.com/StephenButtolph/canoto/canoto + github.com/onsi/ginkgo/v2/ginkgo + go.uber.org/mock/mockgen +) diff --git a/message/mocks_generate_test.go b/message/mocks_generate_test.go index 08bbe3cb8730..36b480992ecd 100644 --- a/message/mocks_generate_test.go +++ b/message/mocks_generate_test.go @@ -3,5 +3,5 @@ package message -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/outbound_message.go -mock_names=OutboundMessage=OutboundMessage . OutboundMessage -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/outbound_message_builder.go -mock_names=OutboundMsgBuilder=OutboundMsgBuilder . OutboundMsgBuilder +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/outbound_message.go -mock_names=OutboundMessage=OutboundMessage . OutboundMessage +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/outbound_message_builder.go -mock_names=OutboundMsgBuilder=OutboundMsgBuilder . OutboundMsgBuilder diff --git a/simplex/block.go b/simplex/block.go index f25256c15b84..3f473e59c99c 100644 --- a/simplex/block.go +++ b/simplex/block.go @@ -3,7 +3,7 @@ package simplex -//go:generate go run github.com/StephenButtolph/canoto/canoto $GOFILE +//go:generate go tool canoto $GOFILE import ( "context" diff --git a/simplex/qc.go b/simplex/qc.go index 56d12842554e..2902228e0575 100644 --- a/simplex/qc.go +++ b/simplex/qc.go @@ -3,7 +3,7 @@ package simplex -//go:generate go run github.com/StephenButtolph/canoto/canoto $GOFILE +//go:generate go tool canoto $GOFILE import ( "bytes" diff --git a/simplex/storage.go b/simplex/storage.go index 1b487f05012f..98323ec11b1d 100644 --- a/simplex/storage.go +++ b/simplex/storage.go @@ -3,7 +3,7 @@ package simplex -//go:generate go run github.com/StephenButtolph/canoto/canoto $GOFILE +//go:generate go tool canoto $GOFILE import ( "context" diff --git a/snow/consensus/snowman/mocks_generate_test.go b/snow/consensus/snowman/mocks_generate_test.go index 99ec539b7955..4336393a826c 100644 --- a/snow/consensus/snowman/mocks_generate_test.go +++ b/snow/consensus/snowman/mocks_generate_test.go @@ -3,4 +3,4 @@ package snowman -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/block.go -mock_names=Block=Block . Block +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/block.go -mock_names=Block=Block . Block diff --git a/snow/engine/avalanche/vertex/mocks_generate_test.go b/snow/engine/avalanche/vertex/mocks_generate_test.go index 1a7be963e7b5..01e3317e1925 100644 --- a/snow/engine/avalanche/vertex/mocks_generate_test.go +++ b/snow/engine/avalanche/vertex/mocks_generate_test.go @@ -3,4 +3,4 @@ package vertex -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/linearizable_vm.go -mock_names=LinearizableVM=LinearizableVM . LinearizableVM +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/linearizable_vm.go -mock_names=LinearizableVM=LinearizableVM . LinearizableVM diff --git a/snow/engine/common/mocks_generate_test.go b/snow/engine/common/mocks_generate_test.go index c4ed88fc619a..a7ed838bbc83 100644 --- a/snow/engine/common/mocks_generate_test.go +++ b/snow/engine/common/mocks_generate_test.go @@ -3,4 +3,4 @@ package common -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/sender.go -mock_names=Sender=Sender . Sender +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/sender.go -mock_names=Sender=Sender . Sender diff --git a/snow/engine/snowman/block/block_context_vm.go b/snow/engine/snowman/block/block_context_vm.go index e0d8436a7274..4d7ce9e1df69 100644 --- a/snow/engine/snowman/block/block_context_vm.go +++ b/snow/engine/snowman/block/block_context_vm.go @@ -3,7 +3,7 @@ package block -//go:generate go run github.com/StephenButtolph/canoto/canoto $GOFILE +//go:generate go tool canoto $GOFILE import ( "context" diff --git a/snow/engine/snowman/block/mocks_generate_test.go b/snow/engine/snowman/block/mocks_generate_test.go index 86335065a899..accafcdd459c 100644 --- a/snow/engine/snowman/block/mocks_generate_test.go +++ b/snow/engine/snowman/block/mocks_generate_test.go @@ -3,8 +3,8 @@ package block -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/build_block_with_context_chain_vm.go -mock_names=BuildBlockWithContextChainVM=BuildBlockWithContextChainVM . BuildBlockWithContextChainVM -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/chain_vm.go -mock_names=ChainVM=ChainVM . ChainVM -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/state_syncable_vm.go -mock_names=StateSyncableVM=StateSyncableVM . StateSyncableVM -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/with_verify_context.go -mock_names=WithVerifyContext=WithVerifyContext . WithVerifyContext -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/full_vm.go -mock_names=FullVM=FullVM . FullVM +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/build_block_with_context_chain_vm.go -mock_names=BuildBlockWithContextChainVM=BuildBlockWithContextChainVM . BuildBlockWithContextChainVM +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/chain_vm.go -mock_names=ChainVM=ChainVM . ChainVM +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/state_syncable_vm.go -mock_names=StateSyncableVM=StateSyncableVM . StateSyncableVM +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/with_verify_context.go -mock_names=WithVerifyContext=WithVerifyContext . WithVerifyContext +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/full_vm.go -mock_names=FullVM=FullVM . FullVM diff --git a/snow/networking/handler/mocks_generate_test.go b/snow/networking/handler/mocks_generate_test.go index b2cfff11e450..984383449048 100644 --- a/snow/networking/handler/mocks_generate_test.go +++ b/snow/networking/handler/mocks_generate_test.go @@ -3,4 +3,4 @@ package handler -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/handler.go -mock_names=Handler=Handler . Handler +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/handler.go -mock_names=Handler=Handler . Handler diff --git a/snow/networking/router/mocks_generate_test.go b/snow/networking/router/mocks_generate_test.go index 1112a9bff6f5..0f3f3e76c895 100644 --- a/snow/networking/router/mocks_generate_test.go +++ b/snow/networking/router/mocks_generate_test.go @@ -3,4 +3,4 @@ package router -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/router.go -mock_names=Router=Router . Router +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/router.go -mock_names=Router=Router . Router diff --git a/snow/networking/sender/mocks_generate_test.go b/snow/networking/sender/mocks_generate_test.go index 682f81c460f5..6071fcd079dc 100644 --- a/snow/networking/sender/mocks_generate_test.go +++ b/snow/networking/sender/mocks_generate_test.go @@ -3,4 +3,4 @@ package sender -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/external_sender.go -mock_names=ExternalSender=ExternalSender . ExternalSender +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/external_sender.go -mock_names=ExternalSender=ExternalSender . ExternalSender diff --git a/snow/networking/timeout/mocks_generate_test.go b/snow/networking/timeout/mocks_generate_test.go index bbc31250ffff..4ee9c2133628 100644 --- a/snow/networking/timeout/mocks_generate_test.go +++ b/snow/networking/timeout/mocks_generate_test.go @@ -3,4 +3,4 @@ package timeout -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager diff --git a/snow/networking/tracker/mocks_generate_test.go b/snow/networking/tracker/mocks_generate_test.go index d87f7d5bcef2..6002955563df 100644 --- a/snow/networking/tracker/mocks_generate_test.go +++ b/snow/networking/tracker/mocks_generate_test.go @@ -3,5 +3,5 @@ package tracker -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/targeter.go -mock_names=Targeter=Targeter . Targeter -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/tracker.go -mock_names=Tracker=Tracker . Tracker +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/targeter.go -mock_names=Targeter=Targeter . Targeter +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/tracker.go -mock_names=Tracker=Tracker . Tracker diff --git a/snow/uptime/mocks_generate_test.go b/snow/uptime/mocks_generate_test.go index a158d1547faf..e281b22cbfdc 100644 --- a/snow/uptime/mocks_generate_test.go +++ b/snow/uptime/mocks_generate_test.go @@ -3,4 +3,4 @@ package uptime -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/calculator.go -mock_names=Calculator=Calculator . Calculator +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/calculator.go -mock_names=Calculator=Calculator . Calculator diff --git a/snow/validators/mocks_generate_test.go b/snow/validators/mocks_generate_test.go index 04cc1ed8ca6f..14265d306c98 100644 --- a/snow/validators/mocks_generate_test.go +++ b/snow/validators/mocks_generate_test.go @@ -3,4 +3,4 @@ package validators -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/state.go -mock_names=State=State . State +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/state.go -mock_names=State=State . State diff --git a/tools.go b/tools.go deleted file mode 100644 index 4bc70b11b01a..000000000000 --- a/tools.go +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2019-2025, Ava Labs, Inc. All rights reserved. -// See the file LICENSE for licensing terms. - -package avalanchego - -import ( - _ "github.com/StephenButtolph/canoto/generate" - _ "golang.org/x/mod/semver" // golang.org/x/mod to satisfy requirement for go.uber.org/mock/mockgen@v0.5 -) diff --git a/utils/filesystem/mocks_generate_test.go b/utils/filesystem/mocks_generate_test.go index 075afa809aa3..43fa5eae0a51 100644 --- a/utils/filesystem/mocks_generate_test.go +++ b/utils/filesystem/mocks_generate_test.go @@ -3,4 +3,4 @@ package filesystem -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/reader.go -mock_names=Reader=Reader . Reader +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/reader.go -mock_names=Reader=Reader . Reader diff --git a/utils/hashing/mocks_generate_test.go b/utils/hashing/mocks_generate_test.go index 4a463cd659fe..271f3f893ee5 100644 --- a/utils/hashing/mocks_generate_test.go +++ b/utils/hashing/mocks_generate_test.go @@ -3,4 +3,4 @@ package hashing -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/hasher.go -mock_names=Hasher=Hasher . Hasher +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/hasher.go -mock_names=Hasher=Hasher . Hasher diff --git a/utils/resource/mocks_generate_test.go b/utils/resource/mocks_generate_test.go index 555b3091b107..0bc633a2cfd1 100644 --- a/utils/resource/mocks_generate_test.go +++ b/utils/resource/mocks_generate_test.go @@ -3,4 +3,4 @@ package resource -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/user.go -mock_names=User=User . User +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/user.go -mock_names=User=User . User diff --git a/vms/avm/block/executor/mocks_generate_test.go b/vms/avm/block/executor/mocks_generate_test.go index b7f40e3748a5..29f369878f2e 100644 --- a/vms/avm/block/executor/mocks_generate_test.go +++ b/vms/avm/block/executor/mocks_generate_test.go @@ -3,4 +3,4 @@ package executor -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager diff --git a/vms/avm/block/mocks_generate_test.go b/vms/avm/block/mocks_generate_test.go index f17129b12965..e7deeceb31e6 100644 --- a/vms/avm/block/mocks_generate_test.go +++ b/vms/avm/block/mocks_generate_test.go @@ -3,4 +3,4 @@ package block -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE} -destination=mock_block.go . Block +//go:generate go tool mockgen -package=${GOPACKAGE} -destination=mock_block.go . Block diff --git a/vms/avm/metrics/mocks_generate_test.go b/vms/avm/metrics/mocks_generate_test.go index 0df237164960..7398abeb5015 100644 --- a/vms/avm/metrics/mocks_generate_test.go +++ b/vms/avm/metrics/mocks_generate_test.go @@ -3,4 +3,4 @@ package metrics -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/metrics.go -mock_names=Metrics=Metrics . Metrics +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/metrics.go -mock_names=Metrics=Metrics . Metrics diff --git a/vms/avm/state/mocks_generate_test.go b/vms/avm/state/mocks_generate_test.go index fd7b4a0505ab..1c063f9ca32c 100644 --- a/vms/avm/state/mocks_generate_test.go +++ b/vms/avm/state/mocks_generate_test.go @@ -3,6 +3,6 @@ package state -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/chain.go -mock_names=Chain=Chain . Chain -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/diff.go -mock_names=Diff=Diff . Diff -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/state.go -mock_names=State=State . State +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/chain.go -mock_names=Chain=Chain . Chain +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/diff.go -mock_names=Diff=Diff . Diff +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/state.go -mock_names=State=State . State diff --git a/vms/avm/txs/mocks_generate_test.go b/vms/avm/txs/mocks_generate_test.go index e5c4ccdf2ec5..5a696e37ae35 100644 --- a/vms/avm/txs/mocks_generate_test.go +++ b/vms/avm/txs/mocks_generate_test.go @@ -3,4 +3,4 @@ package txs -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/tx.go -mock_names=UnsignedTx=UnsignedTx . UnsignedTx +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/tx.go -mock_names=UnsignedTx=UnsignedTx . UnsignedTx diff --git a/vms/components/avax/mocks_generate_test.go b/vms/components/avax/mocks_generate_test.go index 14a6a042f941..28f941eb5f5c 100644 --- a/vms/components/avax/mocks_generate_test.go +++ b/vms/components/avax/mocks_generate_test.go @@ -3,4 +3,4 @@ package avax -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/transferable_in.go -mock_names=TransferableIn=TransferableIn . TransferableIn +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/transferable_in.go -mock_names=TransferableIn=TransferableIn . TransferableIn diff --git a/vms/components/verify/mocks_generate_test.go b/vms/components/verify/mocks_generate_test.go index 9ca51d4d2b69..992c927b7f1b 100644 --- a/vms/components/verify/mocks_generate_test.go +++ b/vms/components/verify/mocks_generate_test.go @@ -3,4 +3,4 @@ package verify -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/verifiable.go -mock_names=Verifiable=Verifiable . Verifiable +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/verifiable.go -mock_names=Verifiable=Verifiable . Verifiable diff --git a/vms/mocks_generate_test.go b/vms/mocks_generate_test.go index e8efddf82c27..71301372ab89 100644 --- a/vms/mocks_generate_test.go +++ b/vms/mocks_generate_test.go @@ -3,5 +3,5 @@ package vms -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/factory.go -mock_names=Factory=Factory . Factory -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/factory.go -mock_names=Factory=Factory . Factory +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager diff --git a/vms/platformvm/block/executor/mocks_generate_test.go b/vms/platformvm/block/executor/mocks_generate_test.go index b7f40e3748a5..29f369878f2e 100644 --- a/vms/platformvm/block/executor/mocks_generate_test.go +++ b/vms/platformvm/block/executor/mocks_generate_test.go @@ -3,4 +3,4 @@ package executor -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/manager.go -mock_names=Manager=Manager . Manager diff --git a/vms/platformvm/block/mocks_generate_test.go b/vms/platformvm/block/mocks_generate_test.go index f17129b12965..e7deeceb31e6 100644 --- a/vms/platformvm/block/mocks_generate_test.go +++ b/vms/platformvm/block/mocks_generate_test.go @@ -3,4 +3,4 @@ package block -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE} -destination=mock_block.go . Block +//go:generate go tool mockgen -package=${GOPACKAGE} -destination=mock_block.go . Block diff --git a/vms/platformvm/fx/mocks_generate_test.go b/vms/platformvm/fx/mocks_generate_test.go index 6e27f4dd6992..ff95f8126382 100644 --- a/vms/platformvm/fx/mocks_generate_test.go +++ b/vms/platformvm/fx/mocks_generate_test.go @@ -3,4 +3,4 @@ package fx -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/fx.go -mock_names=Fx=Fx . Fx +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/fx.go -mock_names=Fx=Fx . Fx diff --git a/vms/platformvm/signer/mocks_generate_test.go b/vms/platformvm/signer/mocks_generate_test.go index e10ad2ab60e1..98cacf98c15a 100644 --- a/vms/platformvm/signer/mocks_generate_test.go +++ b/vms/platformvm/signer/mocks_generate_test.go @@ -3,4 +3,4 @@ package signer -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -source=signer.go -destination=${GOPACKAGE}mock/signer.go -mock_names=Signer=Signer +//go:generate go tool mockgen -package=${GOPACKAGE}mock -source=signer.go -destination=${GOPACKAGE}mock/signer.go -mock_names=Signer=Signer diff --git a/vms/platformvm/state/mocks_generate_test.go b/vms/platformvm/state/mocks_generate_test.go index b368feea3f4e..570b48b0ef7a 100644 --- a/vms/platformvm/state/mocks_generate_test.go +++ b/vms/platformvm/state/mocks_generate_test.go @@ -3,6 +3,6 @@ package state -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE} -destination=mock_diff.go . Diff -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE} -destination=mock_state.go . State -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE} -destination=mock_chain.go . Chain +//go:generate go tool mockgen -package=${GOPACKAGE} -destination=mock_diff.go . Diff +//go:generate go tool mockgen -package=${GOPACKAGE} -destination=mock_state.go . State +//go:generate go tool mockgen -package=${GOPACKAGE} -destination=mock_chain.go . Chain diff --git a/vms/platformvm/utxo/mocks_generate_test.go b/vms/platformvm/utxo/mocks_generate_test.go index d294bba04736..188ee4490a8f 100644 --- a/vms/platformvm/utxo/mocks_generate_test.go +++ b/vms/platformvm/utxo/mocks_generate_test.go @@ -3,4 +3,4 @@ package utxo -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/verifier.go -mock_names=Verifier=Verifier . Verifier +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/verifier.go -mock_names=Verifier=Verifier . Verifier diff --git a/vms/proposervm/mocks_generate_test.go b/vms/proposervm/mocks_generate_test.go index 15283fb3e8dc..89df3e50a767 100644 --- a/vms/proposervm/mocks_generate_test.go +++ b/vms/proposervm/mocks_generate_test.go @@ -3,4 +3,4 @@ package proposervm -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE} -destination=mocks_test.go . PostForkBlock +//go:generate go tool mockgen -package=${GOPACKAGE} -destination=mocks_test.go . PostForkBlock diff --git a/vms/proposervm/proposer/mocks_generate_test.go b/vms/proposervm/proposer/mocks_generate_test.go index 7df37b12dafb..1d5321bb838f 100644 --- a/vms/proposervm/proposer/mocks_generate_test.go +++ b/vms/proposervm/proposer/mocks_generate_test.go @@ -3,4 +3,4 @@ package proposer -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/windower.go -mock_names=Windower=Windower . Windower +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/windower.go -mock_names=Windower=Windower . Windower diff --git a/vms/registry/mocks_generate_test.go b/vms/registry/mocks_generate_test.go index 88643fa07165..fc9ea97ce6e4 100644 --- a/vms/registry/mocks_generate_test.go +++ b/vms/registry/mocks_generate_test.go @@ -3,5 +3,5 @@ package registry -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/vm_getter.go -mock_names=VMGetter=VMGetter . VMGetter -//go:generate go run go.uber.org/mock/mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/vm_registry.go -mock_names=VMRegistry=VMRegistry . VMRegistry +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/vm_getter.go -mock_names=VMGetter=VMGetter . VMGetter +//go:generate go tool mockgen -package=${GOPACKAGE}mock -destination=${GOPACKAGE}mock/vm_registry.go -mock_names=VMRegistry=VMRegistry . VMRegistry