Skip to content

Commit 180c964

Browse files
committed
mockery: use yaml config, drop go:generate, ignore generated mocks
1 parent 46bbf02 commit 180c964

13 files changed

+16
-4033
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,8 @@ openrpc.json
8585
.pnpm/
8686
.pnpm-store/
8787
.qodo
88+
nil/**/mock_*.go
89+
90+
# mockery output (исключаем helper-тесты)
91+
nil/**/mock_*.go
92+
!nil/**/mock_*_test.go

.mockery.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
1+
all: true
22
mock-build-tags: "test"
33
with-expecter: true
44
inpackage: true
55
recursive: true
6+
7+
packages:
8+
nil/nil/client: {}
9+
nil/internal/db: {}
10+
nil/internal/vm: {}
11+
nil/services/rollup: {}
12+
13+
include-regex: '^(Client|DB|RwTx|StateDBReadOnly|L1BlockFetcher)$'

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,4 @@ clean:
110110

111111
.PHONY: mocks
112112
mocks: ssz_types
113-
@for p in $(shell grep -rl '//go:generate mockery' --exclude-dir=vendor | xargs -n1 dirname | sort -u); do \
114-
go generate -run "mockery" $$p; \
115-
done
113+
mockery --config=.mockery.yaml

nil/Makefile.inc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ gen_rollup_contracts_bindings: \
1717

1818
.PHONY: generate_mocks
1919
generate_mocks: ssz_types
20-
@for p in $(shell grep -rl '//go:generate mockery' --exclude-dir=vendor | xargs -n1 dirname | sort -u); do \
21-
go generate -run "mockery" $$p; \
22-
done
20+
mockery --config=.mockery.yaml

nil/client/client.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/NilFoundation/nil/nil/services/txnpool"
1919
)
2020

21-
//go:generate mockery --name=Client
2221

2322
type BatchRequest interface {
2423
GetBlock(shardId types.ShardId, blockId any, fullTx bool) (uint64, error)

0 commit comments

Comments
 (0)