Skip to content

Switch mock generation from **moq** to **mockery** (build-tag test) markdown #877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Switch mock generation from **moq** to **mockery** (build-tag test) markdown #877

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46bbf02
migrate mocks to mockery (build-tag test)
reject-i May 2, 2025
180c964
mockery: use yaml config, drop go:generate, ignore generated mocks
reject-i May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .mockery.yaml
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I see, mockery has a completely different API for assertions in comparison to moq
So, all existing tests should also be adjusted

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

mock-build-tags: "test"
with-expecter: true
inpackage: true
recursive: true
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,9 @@ clean:
go clean -cache
rm -fr build/*
rm -fr contracts/compiled/*

.PHONY: mocks
mocks: ssz_types
@for p in $(shell grep -rl '//go:generate mockery' --exclude-dir=vendor | xargs -n1 dirname | sort -u); do \
go generate -run "mockery" $$p; \
done
25 changes: 4 additions & 21 deletions nil/Makefile.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,7 @@ gen_rollup_contracts_bindings: \
$(root_relayer)/gen_l2_mocks

.PHONY: generate_mocks
generate_mocks: \
$(root_client)/client_generated_mock.go \
$(root_vm)/state_generated_mock.go \
$(root_db)/rwtx_generated_mock.go \
$(root_db)/db_generated_mock.go \
$(root_rollup)/l1_fetcher_generated_mock.go \

$(root_client)/client_generated_mock.go: $(root_client)/client.go ssz_types
cd $(root_client) && go generate

$(root_vm)/state_generated_mock.go: $(root_vm)/interface.go ssz_types
cd $(root_vm) && go generate

$(root_db)/rwtx_generated_mock.go: $(root_db)/kv.go ssz_types
cd $(root_db) && go generate -run="rwtx_" kv.go

$(root_db)/db_generated_mock.go: $(root_db)/kv.go ssz_types
cd $(root_db) && go generate -run="db_" kv.go

$(root_rollup)/l1_fetcher_generated_mock.go: $(root_rollup)/l1_fetcher.go
cd $(root_rollup) && go generate l1_fetcher.go
generate_mocks: ssz_types
@for p in $(shell grep -rl '//go:generate mockery' --exclude-dir=vendor | xargs -n1 dirname | sort -u); do \
go generate -run "mockery" $$p; \
done
2 changes: 1 addition & 1 deletion nil/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/NilFoundation/nil/nil/services/txnpool"
)

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

type BatchRequest interface {
GetBlock(shardId types.ShardId, blockId any, fullTx bool) (uint64, error)
Expand Down
Loading