Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
08d27b7
build(deps): Bump github.com/vektra/mockery/v2 from 2.41.0 to 2.46.2
dependabot[bot] Oct 11, 2024
ed05eea
chore: update deps
lklimek Oct 11, 2024
35627d9
build(deps): Upgrade go to 1.23
lklimek Oct 11, 2024
e924ddc
chore: trigger workflow
lklimek Oct 11, 2024
cdd6e63
Merge remote-tracking branch 'origin/dependabot/go_modules/github.com…
lklimek Oct 11, 2024
f7430f2
chore: make mockery
lklimek Oct 11, 2024
19ddf57
chore: fix typo
lklimek Oct 11, 2024
ed40649
Merge branch 'v1.3-dev' into build/go-1.23
lklimek Oct 11, 2024
809073e
build(deps): upgrade golangci-lint to 1.61
lklimek Oct 11, 2024
5e84ee7
build(github): display mockery diff for debugging
lklimek Oct 11, 2024
1f64216
chore: upgrade mockery config to new format
lklimek Oct 11, 2024
d4bfcde
chore: update mockery
lklimek Oct 11, 2024
0018a7f
chore: regenerate all mocks
lklimek Oct 11, 2024
2416140
chore: no expecters
lklimek Oct 11, 2024
b96c288
chore: updated check-mocks
lklimek Oct 11, 2024
36b0bae
chore: use prebuilt mockery
lklimek Oct 11, 2024
24c796a
Merge remote-tracking branch 'origin/v1.3-dev' into fix/mockery
lklimek Oct 16, 2024
311b1e1
Merge remote-tracking branch 'origin/v1.3-dev' into fix/mockery
lklimek Nov 2, 2024
a2b7ed4
Merge branch 'v1.3-dev' into fix/mockery
lklimek Nov 2, 2024
ac34cf2
chore: fix consistency of indexermocks invocation
lklimek Nov 4, 2024
10817a3
build(deps): update mockery to 2.46.3
lklimek Nov 5, 2024
af889e0
Merge branch 'v1.3-dev' into fix/mockery
lklimek Nov 6, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.23"
go-version: "1.23.2"

- uses: actions/checkout@v4

Expand All @@ -35,7 +35,7 @@ jobs:
curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
make mockery 2>/dev/null

if ! git diff --stat --exit-code ; then
if ! git diff --exit-code ; then
echo ">> ERROR:"
echo ">>"
echo ">> Generated mocks require update (either Mockery or source files may have changed)."
Expand Down
71 changes: 71 additions & 0 deletions .mockery.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
---
with-expecter: false
dir: "{{.InterfaceDir}}/mocks"
mockname: "{{.InterfaceName}}"
outpkg: "mocks"
filename: "{{.InterfaceName | lower}}.go"
log-level: "warn"
disable-version-string: true
all: false
packages:
github.com/dashpay/tenderdash/abci/client:
interfaces:
Client:
github.com/dashpay/tenderdash/abci/types:
interfaces:
Application:
github.com/dashpay/tenderdash/dash/core:
interfaces:
Client:
github.com/dashpay/tenderdash/internal/consensus:
interfaces:
Gossiper:
github.com/dashpay/tenderdash/internal/consensus/versioned/selectproposer:
interfaces:
ProposerSelector:
github.com/dashpay/tenderdash/internal/evidence:
interfaces:
BlockStore:
github.com/dashpay/tenderdash/internal/mempool:
interfaces:
Mempool:
github.com/dashpay/tenderdash/internal/p2p:
interfaces:
Transport:
Connection:
Channel:
github.com/dashpay/tenderdash/internal/p2p/client:
interfaces:
Client:
BlockClient:
SnapshotClient:
github.com/dashpay/tenderdash/internal/state:
interfaces:
BlockStore:
EvidencePool:
Executor:
Store:
github.com/dashpay/tenderdash/internal/state/indexer:
interfaces:
EventSink:
github.com/dashpay/tenderdash/internal/statesync:
interfaces:
StateProvider:
github.com/dashpay/tenderdash/libs/store:
interfaces:
Store:
github.com/dashpay/tenderdash/light/provider:
interfaces:
Provider:
github.com/dashpay/tenderdash/light/rpc:
interfaces:
LightClient:
github.com/dashpay/tenderdash/rpc/client:
interfaces:
Client:
RemoteClient:
github.com/dashpay/tenderdash/types:
interfaces:
Store:
PrivValidator:
BlockEventPublisher:
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ build-docker:
###############################################################################

mockery:
go generate -run="./scripts/mockery_generate.sh" ./...
./scripts/mockery_generate.sh
.PHONY: mockery

###############################################################################
Expand Down
3 changes: 2 additions & 1 deletion cmd/tenderdash/commands/reindex_event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
abcitypes "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/config"
"github.com/dashpay/tenderdash/internal/state/indexer"
imocks "github.com/dashpay/tenderdash/internal/state/indexer/mocks"
"github.com/dashpay/tenderdash/internal/state/mocks"
"github.com/dashpay/tenderdash/libs/log"
"github.com/dashpay/tenderdash/proto/tendermint/state"
Expand Down Expand Up @@ -136,7 +137,7 @@ func TestLoadBlockStore(t *testing.T) {
func TestReIndexEvent(t *testing.T) {
mockBlockStore := &mocks.BlockStore{}
mockStateStore := &mocks.Store{}
mockEventSink := &mocks.EventSink{}
mockEventSink := &imocks.EventSink{}

mockBlockStore.
On("Base").Return(base).
Expand Down
10 changes: 6 additions & 4 deletions dash/core/mocks/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 0 additions & 70 deletions internal/blocksync/mocks/block_client.go

This file was deleted.

72 changes: 0 additions & 72 deletions internal/consensus/mocks/fast_sync_reactor.go

This file was deleted.

67 changes: 0 additions & 67 deletions internal/proxy/mocks/app_conn_mempool.go

This file was deleted.

Loading
Loading