From 3e47182100adf1ad9733964d7bc7697578932a0a Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:26:53 +0000 Subject: [PATCH 1/2] Update gomock dependency --- Makefile | 2 +- go.mod | 4 ++-- go.sum | 6 ++++-- internal/postrs/mocks/api.go | 9 +++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0e0fec0aa..43f0b29d6 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ endif GOLANGCI_LINT_VERSION := v1.61.0 GOTESTSUM_VERSION := v1.12.0 -MOCKGEN_VERSION := v0.4.0 +MOCKGEN_VERSION := v0.5.0 build: postcli .PHONY: build diff --git a/go.mod b/go.mod index b9b5d0776..427a93bba 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/natefinch/atomic v1.0.1 github.com/stretchr/testify v1.9.0 github.com/zeebo/blake3 v0.2.4 - go.uber.org/mock v0.4.0 + go.uber.org/mock v0.5.0 go.uber.org/zap v1.27.0 golang.org/x/sync v0.8.0 ) @@ -16,6 +16,6 @@ require ( github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sys v0.25.0 // indirect + golang.org/x/sys v0.26.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index cc03a32a3..2e98cc0f7 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= -go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= @@ -27,6 +27,8 @@ golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/internal/postrs/mocks/api.go b/internal/postrs/mocks/api.go index 001e8f06a..22b77d4ba 100644 --- a/internal/postrs/mocks/api.go +++ b/internal/postrs/mocks/api.go @@ -20,6 +20,7 @@ import ( type MockScrypter struct { ctrl *gomock.Controller recorder *MockScrypterMockRecorder + isgomock struct{} } // MockScrypterMockRecorder is the mock recorder for MockScrypter. @@ -78,18 +79,18 @@ func (c *MockScrypterCloseCall) DoAndReturn(f func() error) *MockScrypterCloseCa } // Positions mocks base method. -func (m *MockScrypter) Positions(arg0, arg1 uint64) (postrs.ScryptPositionsResult, error) { +func (m *MockScrypter) Positions(start, end uint64) (postrs.ScryptPositionsResult, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Positions", arg0, arg1) + ret := m.ctrl.Call(m, "Positions", start, end) ret0, _ := ret[0].(postrs.ScryptPositionsResult) ret1, _ := ret[1].(error) return ret0, ret1 } // Positions indicates an expected call of Positions. -func (mr *MockScrypterMockRecorder) Positions(arg0, arg1 any) *MockScrypterPositionsCall { +func (mr *MockScrypterMockRecorder) Positions(start, end any) *MockScrypterPositionsCall { mr.mock.ctrl.T.Helper() - call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Positions", reflect.TypeOf((*MockScrypter)(nil).Positions), arg0, arg1) + call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Positions", reflect.TypeOf((*MockScrypter)(nil).Positions), start, end) return &MockScrypterPositionsCall{Call: call} } From 53197a9d69e618211121ab2223aca143e1419437 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:30:15 +0000 Subject: [PATCH 2/2] go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 2e98cc0f7..93276deac 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=