Skip to content

Commit 46bbf02

Browse files
committed
migrate mocks to mockery (build-tag test)
1 parent 1c9c18e commit 46bbf02

13 files changed

+4044
-29
lines changed

.mockery.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
mock-build-tags: "test"
3+
with-expecter: true
4+
inpackage: true
5+
recursive: true

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,9 @@ clean:
107107
go clean -cache
108108
rm -fr build/*
109109
rm -fr contracts/compiled/*
110+
111+
.PHONY: mocks
112+
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

nil/Makefile.inc

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,7 @@ gen_rollup_contracts_bindings: \
1616
$(root_relayer)/gen_l2_mocks
1717

1818
.PHONY: generate_mocks
19-
generate_mocks: \
20-
$(root_client)/client_generated_mock.go \
21-
$(root_vm)/state_generated_mock.go \
22-
$(root_db)/rwtx_generated_mock.go \
23-
$(root_db)/db_generated_mock.go \
24-
$(root_rollup)/l1_fetcher_generated_mock.go \
25-
26-
$(root_client)/client_generated_mock.go: $(root_client)/client.go ssz_types
27-
cd $(root_client) && go generate
28-
29-
$(root_vm)/state_generated_mock.go: $(root_vm)/interface.go ssz_types
30-
cd $(root_vm) && go generate
31-
32-
$(root_db)/rwtx_generated_mock.go: $(root_db)/kv.go ssz_types
33-
cd $(root_db) && go generate -run="rwtx_" kv.go
34-
35-
$(root_db)/db_generated_mock.go: $(root_db)/kv.go ssz_types
36-
cd $(root_db) && go generate -run="db_" kv.go
37-
38-
$(root_rollup)/l1_fetcher_generated_mock.go: $(root_rollup)/l1_fetcher.go
39-
cd $(root_rollup) && go generate l1_fetcher.go
19+
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

nil/client/client.go

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

21-
//go:generate go run github.com/matryer/moq -out client_generated_mock.go -rm -stub -with-resets . Client
21+
//go:generate mockery --name=Client
2222

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

0 commit comments

Comments
 (0)