From f7d71cac5776b116c2ebb5e7d147610fd2cb453e Mon Sep 17 00:00:00 2001 From: Fynn Date: Wed, 2 Aug 2023 16:19:06 +0800 Subject: [PATCH] fix ci lint --- go.mod | 1 + go.sum | 2 ++ x/payment/keeper/msg_server_test.go | 3 +-- x/storage/types/expected_keepers_mocks.go | 16 ++++++++-------- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index a0fccf520..bc9ad5a06 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.4 + go.uber.org/mock v0.2.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.56.1 google.golang.org/protobuf v1.30.0 diff --git a/go.sum b/go.sum index 14d29202e..5d94410cf 100644 --- a/go.sum +++ b/go.sum @@ -1454,6 +1454,8 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.3.0/go.mod h1:9CWT6lKIep8U41DDaPiH6eFscnTyjfTANNQNx6LrIcA= go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= +go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= diff --git a/x/payment/keeper/msg_server_test.go b/x/payment/keeper/msg_server_test.go index c72134039..4c6f7ecd1 100644 --- a/x/payment/keeper/msg_server_test.go +++ b/x/payment/keeper/msg_server_test.go @@ -15,7 +15,6 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/bnb-chain/greenfield/testutil/sample" "github.com/bnb-chain/greenfield/x/challenge" "github.com/bnb-chain/greenfield/x/payment/keeper" "github.com/bnb-chain/greenfield/x/payment/types" @@ -88,7 +87,7 @@ func (s *TestSuite) TestUpdateParams() { { name: "invalid authority", msg: types.MsgUpdateParams{ - Authority: sample.AccAddress(), + Authority: s.paymentKeeper.GetAuthority(), }, err: true, }, { diff --git a/x/storage/types/expected_keepers_mocks.go b/x/storage/types/expected_keepers_mocks.go index 12d9f9a5f..718ac345f 100644 --- a/x/storage/types/expected_keepers_mocks.go +++ b/x/storage/types/expected_keepers_mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: expected_keepers.go +// Source: x/storage/types/expected_keepers.go // Package types is a generated GoMock package. package types @@ -9,16 +9,15 @@ import ( reflect "reflect" math "cosmossdk.io/math" - log "github.com/cometbft/cometbft/libs/log" - types3 "github.com/cosmos/cosmos-sdk/types" - types4 "github.com/cosmos/cosmos-sdk/x/auth/types" - gomock "github.com/golang/mock/gomock" - resource "github.com/bnb-chain/greenfield/types/resource" types "github.com/bnb-chain/greenfield/x/payment/types" types0 "github.com/bnb-chain/greenfield/x/permission/types" types1 "github.com/bnb-chain/greenfield/x/sp/types" types2 "github.com/bnb-chain/greenfield/x/virtualgroup/types" + log "github.com/cometbft/cometbft/libs/log" + types3 "github.com/cosmos/cosmos-sdk/types" + types4 "github.com/cosmos/cosmos-sdk/x/auth/types" + gomock "github.com/golang/mock/gomock" ) // MockAccountKeeper is a mock of AccountKeeper interface. @@ -645,11 +644,12 @@ func (mr *MockPermissionKeeperMockRecorder) RemoveGroupMember(ctx, groupID, memb } // VerifyPolicy mocks base method. -func (m *MockPermissionKeeper) VerifyPolicy(ctx types3.Context, resourceID math.Uint, resourceType resource.ResourceType, operator types3.AccAddress, action types0.ActionType, opts *types0.VerifyOptions) types0.Effect { +func (m *MockPermissionKeeper) VerifyPolicy(ctx types3.Context, resourceID math.Uint, resourceType resource.ResourceType, operator types3.AccAddress, action types0.ActionType, opts *types0.VerifyOptions) (types0.Effect, math.Uint) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "VerifyPolicy", ctx, resourceID, resourceType, operator, action, opts) ret0, _ := ret[0].(types0.Effect) - return ret0 + ret1, _ := ret[1].(math.Uint) + return ret0, ret1 } // VerifyPolicy indicates an expected call of VerifyPolicy.