diff --git a/committee/timetableoperator.go b/committee/timetableoperator.go index 5e03cc8..6f549b5 100644 --- a/committee/timetableoperator.go +++ b/committee/timetableoperator.go @@ -86,7 +86,7 @@ func (operator *TimeTableOperator) HeightBefore(ts time.Time, sdb *sql.DB, tx *s } else { err = sdb.QueryRow(operator.heightQuery, tsString, tsString).Scan(&height) } - return uint64(height), err + return uint64(height), nil } // CreateTables prepares the tables for the operator diff --git a/genmock.sh b/genmock.sh index 42fd2c6..e2c4c90 100755 --- a/genmock.sh +++ b/genmock.sh @@ -6,7 +6,7 @@ mkdir -p ./test/mock mkdir -p ./test/mock/mock_committee mockgen -destination=./test/mock/mock_committee/mock_committee.go \ -source=./committee/committee.go \ - -imports =github.com/iotexproject/iotex-election/committee \ + -imports "committee=github.com/iotexproject/iotex-election/committee" \ -package=mock_committee \ Committee @@ -14,4 +14,4 @@ mkdir -p ./test/mock/mock_apiserviceclient mockgen -destination=./test/mock/mock_apiserviceclient/mock_apiserviceclient.go \ -source=./pb/api/api.pb.go \ -package=mock_apiserviceclient \ - APIServiceClient \ No newline at end of file + APIServiceClient diff --git a/go.mod b/go.mod index 3af6337..a639ca6 100644 --- a/go.mod +++ b/go.mod @@ -2,25 +2,25 @@ module github.com/iotexproject/iotex-election go 1.23.0 -toolchain go1.23.3 +toolchain go1.23.7 require ( github.com/bwmarrin/discordgo v0.19.0 github.com/cenkalti/backoff v2.2.1+incompatible github.com/ethereum/go-ethereum v1.10.26 - github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.4 github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d - github.com/iotexproject/go-pkgs v0.1.15 + github.com/iotexproject/go-pkgs v0.1.15-0.20250203050652-f6f37ab0c630 github.com/iotexproject/iotex-address v0.2.8 - github.com/iotexproject/iotex-antenna-go/v2 v2.6.4 + github.com/iotexproject/iotex-antenna-go/v2 v2.6.4-0.20250203054316-e9b97f4e8885 github.com/iotexproject/iotex-proto v0.5.10 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 go.etcd.io/bbolt v1.3.5 + go.uber.org/mock v0.5.2 go.uber.org/zap v1.10.0 golang.org/x/net v0.37.0 google.golang.org/genproto v0.0.0-20201211151036-40ec1c210f7a @@ -46,6 +46,7 @@ require ( github.com/ethereum/c-kzg-4844 v0.4.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect + github.com/golang/mock v1.6.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect diff --git a/go.sum b/go.sum index a4a4b14..d6a1908 100644 --- a/go.sum +++ b/go.sum @@ -147,12 +147,12 @@ github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/iotexproject/go-ethereum v0.5.0 h1:lpmCpO4AdoFElHvrbmcSict86hHmd1yYSMrwIIhQ08k= github.com/iotexproject/go-ethereum v0.5.0/go.mod h1:hKL2Qcj1OvStXNSEDbucexqnEt1Wh4Cz329XsjAalZY= -github.com/iotexproject/go-pkgs v0.1.15 h1:+Mm+avyOhKdSUgnfOOYBfILA8uBgk3pDzmfuAcLMFNo= -github.com/iotexproject/go-pkgs v0.1.15/go.mod h1:T9UX5gAis+Z5j7ZgGwqDbBH+eXWnZgt3nenW4+w7pa8= +github.com/iotexproject/go-pkgs v0.1.15-0.20250203050652-f6f37ab0c630 h1:DyRguJDgv34i0XIVTEWlJ5SvZRWpLNLKbe3/+tBP/xM= +github.com/iotexproject/go-pkgs v0.1.15-0.20250203050652-f6f37ab0c630/go.mod h1:T9UX5gAis+Z5j7ZgGwqDbBH+eXWnZgt3nenW4+w7pa8= github.com/iotexproject/iotex-address v0.2.8 h1:jaTR5pZe/ljiYW4OqHl9NKPs0h1o91Gi6FILOTaBCXw= github.com/iotexproject/iotex-address v0.2.8/go.mod h1:K78yPSMB4K7gF/iQ7djT1amph0RBrP3rSkFfH7gNG70= -github.com/iotexproject/iotex-antenna-go/v2 v2.6.4 h1:7e0VyBDFT+iqwvr/BIk38yf7nCX5a2IEvziI88mlCQs= -github.com/iotexproject/iotex-antenna-go/v2 v2.6.4/go.mod h1:L6AzDHo2TBFDAPA3ly+/PCS4JSX2g3zzhwV8RGQsTDI= +github.com/iotexproject/iotex-antenna-go/v2 v2.6.4-0.20250203054316-e9b97f4e8885 h1:LbjVZSXDYoLmGLfovtb7OeFYcPiHvrrhEXZKPlsaeio= +github.com/iotexproject/iotex-antenna-go/v2 v2.6.4-0.20250203054316-e9b97f4e8885/go.mod h1:L6AzDHo2TBFDAPA3ly+/PCS4JSX2g3zzhwV8RGQsTDI= github.com/iotexproject/iotex-proto v0.5.10 h1:+7Hw8KYposo0tJxgIEnPRpKU/TlQGMNn1S0tpSUz6RI= github.com/iotexproject/iotex-proto v0.5.10/go.mod h1:OfmLvjBmy5EYeLxxDv6kesJq+Mm3Adn5GKgDJgF9G9U= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= @@ -228,8 +228,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= @@ -249,6 +249,8 @@ go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= +go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= diff --git a/test/mock/mock_apiserviceclient/mock_apiserviceclient.go b/test/mock/mock_apiserviceclient/mock_apiserviceclient.go index 1f8f613..eb33041 100644 --- a/test/mock/mock_apiserviceclient/mock_apiserviceclient.go +++ b/test/mock/mock_apiserviceclient/mock_apiserviceclient.go @@ -1,305 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ./pb/api/api.pb.go +// +// Generated by this command: +// +// mockgen -destination=./test/mock/mock_apiserviceclient/mock_apiserviceclient.go -source=./pb/api/api.pb.go -package=mock_apiserviceclient APIServiceClient +// // Package mock_apiserviceclient is a generated GoMock package. package mock_apiserviceclient - -import ( - context "context" - gomock "github.com/golang/mock/gomock" - empty "github.com/golang/protobuf/ptypes/empty" - api "github.com/iotexproject/iotex-election/pb/api" - grpc "google.golang.org/grpc" - reflect "reflect" -) - -// MockAPIServiceClient is a mock of APIServiceClient interface -type MockAPIServiceClient struct { - ctrl *gomock.Controller - recorder *MockAPIServiceClientMockRecorder -} - -// MockAPIServiceClientMockRecorder is the mock recorder for MockAPIServiceClient -type MockAPIServiceClientMockRecorder struct { - mock *MockAPIServiceClient -} - -// NewMockAPIServiceClient creates a new mock instance -func NewMockAPIServiceClient(ctrl *gomock.Controller) *MockAPIServiceClient { - mock := &MockAPIServiceClient{ctrl: ctrl} - mock.recorder = &MockAPIServiceClientMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use -func (m *MockAPIServiceClient) EXPECT() *MockAPIServiceClientMockRecorder { - return m.recorder -} - -// GetMeta mocks base method -func (m *MockAPIServiceClient) GetMeta(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*api.ChainMeta, error) { - m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "GetMeta", varargs...) - ret0, _ := ret[0].(*api.ChainMeta) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetMeta indicates an expected call of GetMeta -func (mr *MockAPIServiceClientMockRecorder) GetMeta(ctx, in interface{}, opts ...interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMeta", reflect.TypeOf((*MockAPIServiceClient)(nil).GetMeta), varargs...) -} - -// GetCandidates mocks base method -func (m *MockAPIServiceClient) GetCandidates(ctx context.Context, in *api.GetCandidatesRequest, opts ...grpc.CallOption) (*api.CandidateResponse, error) { - m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "GetCandidates", varargs...) - ret0, _ := ret[0].(*api.CandidateResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetCandidates indicates an expected call of GetCandidates -func (mr *MockAPIServiceClientMockRecorder) GetCandidates(ctx, in interface{}, opts ...interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCandidates", reflect.TypeOf((*MockAPIServiceClient)(nil).GetCandidates), varargs...) -} - -// GetCandidateByName mocks base method -func (m *MockAPIServiceClient) GetCandidateByName(ctx context.Context, in *api.GetCandidateByNameRequest, opts ...grpc.CallOption) (*api.Candidate, error) { - m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "GetCandidateByName", varargs...) - ret0, _ := ret[0].(*api.Candidate) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetCandidateByName indicates an expected call of GetCandidateByName -func (mr *MockAPIServiceClientMockRecorder) GetCandidateByName(ctx, in interface{}, opts ...interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCandidateByName", reflect.TypeOf((*MockAPIServiceClient)(nil).GetCandidateByName), varargs...) -} - -// GetBucketsByCandidate mocks base method -func (m *MockAPIServiceClient) GetBucketsByCandidate(ctx context.Context, in *api.GetBucketsByCandidateRequest, opts ...grpc.CallOption) (*api.BucketResponse, error) { - m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "GetBucketsByCandidate", varargs...) - ret0, _ := ret[0].(*api.BucketResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBucketsByCandidate indicates an expected call of GetBucketsByCandidate -func (mr *MockAPIServiceClientMockRecorder) GetBucketsByCandidate(ctx, in interface{}, opts ...interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBucketsByCandidate", reflect.TypeOf((*MockAPIServiceClient)(nil).GetBucketsByCandidate), varargs...) -} - -// GetBuckets mocks base method -func (m *MockAPIServiceClient) GetBuckets(ctx context.Context, in *api.GetBucketsRequest, opts ...grpc.CallOption) (*api.BucketResponse, error) { - m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "GetBuckets", varargs...) - ret0, _ := ret[0].(*api.BucketResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBuckets indicates an expected call of GetBuckets -func (mr *MockAPIServiceClientMockRecorder) GetBuckets(ctx, in interface{}, opts ...interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBuckets", reflect.TypeOf((*MockAPIServiceClient)(nil).GetBuckets), varargs...) -} - -// IsHealth mocks base method -func (m *MockAPIServiceClient) IsHealth(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*api.HealthCheckResponse, error) { - m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "IsHealth", varargs...) - ret0, _ := ret[0].(*api.HealthCheckResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// IsHealth indicates an expected call of IsHealth -func (mr *MockAPIServiceClientMockRecorder) IsHealth(ctx, in interface{}, opts ...interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsHealth", reflect.TypeOf((*MockAPIServiceClient)(nil).IsHealth), varargs...) -} - -// GetRawData mocks base method -func (m *MockAPIServiceClient) GetRawData(ctx context.Context, in *api.GetRawDataRequest, opts ...grpc.CallOption) (*api.RawDataResponse, error) { - m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "GetRawData", varargs...) - ret0, _ := ret[0].(*api.RawDataResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetRawData indicates an expected call of GetRawData -func (mr *MockAPIServiceClientMockRecorder) GetRawData(ctx, in interface{}, opts ...interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRawData", reflect.TypeOf((*MockAPIServiceClient)(nil).GetRawData), varargs...) -} - -// MockAPIServiceServer is a mock of APIServiceServer interface -type MockAPIServiceServer struct { - ctrl *gomock.Controller - recorder *MockAPIServiceServerMockRecorder -} - -// MockAPIServiceServerMockRecorder is the mock recorder for MockAPIServiceServer -type MockAPIServiceServerMockRecorder struct { - mock *MockAPIServiceServer -} - -// NewMockAPIServiceServer creates a new mock instance -func NewMockAPIServiceServer(ctrl *gomock.Controller) *MockAPIServiceServer { - mock := &MockAPIServiceServer{ctrl: ctrl} - mock.recorder = &MockAPIServiceServerMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use -func (m *MockAPIServiceServer) EXPECT() *MockAPIServiceServerMockRecorder { - return m.recorder -} - -// GetMeta mocks base method -func (m *MockAPIServiceServer) GetMeta(arg0 context.Context, arg1 *empty.Empty) (*api.ChainMeta, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetMeta", arg0, arg1) - ret0, _ := ret[0].(*api.ChainMeta) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetMeta indicates an expected call of GetMeta -func (mr *MockAPIServiceServerMockRecorder) GetMeta(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMeta", reflect.TypeOf((*MockAPIServiceServer)(nil).GetMeta), arg0, arg1) -} - -// GetCandidates mocks base method -func (m *MockAPIServiceServer) GetCandidates(arg0 context.Context, arg1 *api.GetCandidatesRequest) (*api.CandidateResponse, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetCandidates", arg0, arg1) - ret0, _ := ret[0].(*api.CandidateResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetCandidates indicates an expected call of GetCandidates -func (mr *MockAPIServiceServerMockRecorder) GetCandidates(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCandidates", reflect.TypeOf((*MockAPIServiceServer)(nil).GetCandidates), arg0, arg1) -} - -// GetCandidateByName mocks base method -func (m *MockAPIServiceServer) GetCandidateByName(arg0 context.Context, arg1 *api.GetCandidateByNameRequest) (*api.Candidate, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetCandidateByName", arg0, arg1) - ret0, _ := ret[0].(*api.Candidate) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetCandidateByName indicates an expected call of GetCandidateByName -func (mr *MockAPIServiceServerMockRecorder) GetCandidateByName(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCandidateByName", reflect.TypeOf((*MockAPIServiceServer)(nil).GetCandidateByName), arg0, arg1) -} - -// GetBucketsByCandidate mocks base method -func (m *MockAPIServiceServer) GetBucketsByCandidate(arg0 context.Context, arg1 *api.GetBucketsByCandidateRequest) (*api.BucketResponse, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetBucketsByCandidate", arg0, arg1) - ret0, _ := ret[0].(*api.BucketResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBucketsByCandidate indicates an expected call of GetBucketsByCandidate -func (mr *MockAPIServiceServerMockRecorder) GetBucketsByCandidate(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBucketsByCandidate", reflect.TypeOf((*MockAPIServiceServer)(nil).GetBucketsByCandidate), arg0, arg1) -} - -// GetBuckets mocks base method -func (m *MockAPIServiceServer) GetBuckets(arg0 context.Context, arg1 *api.GetBucketsRequest) (*api.BucketResponse, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetBuckets", arg0, arg1) - ret0, _ := ret[0].(*api.BucketResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBuckets indicates an expected call of GetBuckets -func (mr *MockAPIServiceServerMockRecorder) GetBuckets(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBuckets", reflect.TypeOf((*MockAPIServiceServer)(nil).GetBuckets), arg0, arg1) -} - -// IsHealth mocks base method -func (m *MockAPIServiceServer) IsHealth(arg0 context.Context, arg1 *empty.Empty) (*api.HealthCheckResponse, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsHealth", arg0, arg1) - ret0, _ := ret[0].(*api.HealthCheckResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// IsHealth indicates an expected call of IsHealth -func (mr *MockAPIServiceServerMockRecorder) IsHealth(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsHealth", reflect.TypeOf((*MockAPIServiceServer)(nil).IsHealth), arg0, arg1) -} - -// GetRawData mocks base method -func (m *MockAPIServiceServer) GetRawData(arg0 context.Context, arg1 *api.GetRawDataRequest) (*api.RawDataResponse, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetRawData", arg0, arg1) - ret0, _ := ret[0].(*api.RawDataResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetRawData indicates an expected call of GetRawData -func (mr *MockAPIServiceServerMockRecorder) GetRawData(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRawData", reflect.TypeOf((*MockAPIServiceServer)(nil).GetRawData), arg0, arg1) -} diff --git a/test/mock/mock_committee/mock_committee.go b/test/mock/mock_committee/mock_committee.go index 6dd198c..d010952 100644 --- a/test/mock/mock_committee/mock_committee.go +++ b/test/mock/mock_committee/mock_committee.go @@ -1,85 +1,107 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ./committee/committee.go +// +// Generated by this command: +// +// mockgen -destination=./test/mock/mock_committee/mock_committee.go -source=./committee/committee.go -imports committee=github.com/iotexproject/iotex-election/committee -package=mock_committee Committee +// // Package mock_committee is a generated GoMock package. package mock_committee import ( context "context" - gomock "github.com/golang/mock/gomock" - committee "github.com/iotexproject/iotex-election/committee" - types "github.com/iotexproject/iotex-election/types" reflect "reflect" time "time" + + committee "github.com/iotexproject/iotex-election/committee" + types "github.com/iotexproject/iotex-election/types" + gomock "go.uber.org/mock/gomock" ) -// MockCommittee is a mock of Committee interface +// MockCommittee is a mock of Committee interface. type MockCommittee struct { ctrl *gomock.Controller recorder *MockCommitteeMockRecorder + isgomock struct{} } -// MockCommitteeMockRecorder is the mock recorder for MockCommittee +// MockCommitteeMockRecorder is the mock recorder for MockCommittee. type MockCommitteeMockRecorder struct { mock *MockCommittee } -// NewMockCommittee creates a new mock instance +// NewMockCommittee creates a new mock instance. func NewMockCommittee(ctrl *gomock.Controller) *MockCommittee { mock := &MockCommittee{ctrl: ctrl} mock.recorder = &MockCommitteeMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockCommittee) EXPECT() *MockCommitteeMockRecorder { return m.recorder } -// Start mocks base method -func (m *MockCommittee) Start(arg0 context.Context) error { +// HeightByTime mocks base method. +func (m *MockCommittee) HeightByTime(arg0 time.Time) (uint64, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Start", arg0) - ret0, _ := ret[0].(error) - return ret0 + ret := m.ctrl.Call(m, "HeightByTime", arg0) + ret0, _ := ret[0].(uint64) + ret1, _ := ret[1].(error) + return ret0, ret1 } -// Start indicates an expected call of Start -func (mr *MockCommitteeMockRecorder) Start(arg0 interface{}) *gomock.Call { +// HeightByTime indicates an expected call of HeightByTime. +func (mr *MockCommitteeMockRecorder) HeightByTime(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockCommittee)(nil).Start), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeightByTime", reflect.TypeOf((*MockCommittee)(nil).HeightByTime), arg0) } -// Stop mocks base method -func (m *MockCommittee) Stop(arg0 context.Context) error { +// LatestHeight mocks base method. +func (m *MockCommittee) LatestHeight() uint64 { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stop", arg0) - ret0, _ := ret[0].(error) + ret := m.ctrl.Call(m, "LatestHeight") + ret0, _ := ret[0].(uint64) return ret0 } -// Stop indicates an expected call of Stop -func (mr *MockCommitteeMockRecorder) Stop(arg0 interface{}) *gomock.Call { +// LatestHeight indicates an expected call of LatestHeight. +func (mr *MockCommitteeMockRecorder) LatestHeight() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockCommittee)(nil).Stop), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LatestHeight", reflect.TypeOf((*MockCommittee)(nil).LatestHeight)) } -// ResultByHeight mocks base method -func (m *MockCommittee) ResultByHeight(arg0 uint64) (*types.ElectionResult, error) { +// NativeBucketsByEpoch mocks base method. +func (m *MockCommittee) NativeBucketsByEpoch(arg0 uint64) ([]*types.Bucket, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ResultByHeight", arg0) - ret0, _ := ret[0].(*types.ElectionResult) + ret := m.ctrl.Call(m, "NativeBucketsByEpoch", arg0) + ret0, _ := ret[0].([]*types.Bucket) ret1, _ := ret[1].(error) return ret0, ret1 } -// ResultByHeight indicates an expected call of ResultByHeight -func (mr *MockCommitteeMockRecorder) ResultByHeight(arg0 interface{}) *gomock.Call { +// NativeBucketsByEpoch indicates an expected call of NativeBucketsByEpoch. +func (mr *MockCommitteeMockRecorder) NativeBucketsByEpoch(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResultByHeight", reflect.TypeOf((*MockCommittee)(nil).ResultByHeight), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NativeBucketsByEpoch", reflect.TypeOf((*MockCommittee)(nil).NativeBucketsByEpoch), arg0) +} + +// PutNativePollByEpoch mocks base method. +func (m *MockCommittee) PutNativePollByEpoch(arg0 uint64, arg1 time.Time, arg2 []*types.Bucket) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "PutNativePollByEpoch", arg0, arg1, arg2) + ret0, _ := ret[0].(error) + return ret0 } -// RawDataByHeight mocks base method +// PutNativePollByEpoch indicates an expected call of PutNativePollByEpoch. +func (mr *MockCommitteeMockRecorder) PutNativePollByEpoch(arg0, arg1, arg2 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutNativePollByEpoch", reflect.TypeOf((*MockCommittee)(nil).PutNativePollByEpoch), arg0, arg1, arg2) +} + +// RawDataByHeight mocks base method. func (m *MockCommittee) RawDataByHeight(arg0 uint64) ([]*types.Bucket, []*types.Registration, time.Time, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RawDataByHeight", arg0) @@ -90,42 +112,42 @@ func (m *MockCommittee) RawDataByHeight(arg0 uint64) ([]*types.Bucket, []*types. return ret0, ret1, ret2, ret3 } -// RawDataByHeight indicates an expected call of RawDataByHeight -func (mr *MockCommitteeMockRecorder) RawDataByHeight(arg0 interface{}) *gomock.Call { +// RawDataByHeight indicates an expected call of RawDataByHeight. +func (mr *MockCommitteeMockRecorder) RawDataByHeight(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RawDataByHeight", reflect.TypeOf((*MockCommittee)(nil).RawDataByHeight), arg0) } -// HeightByTime mocks base method -func (m *MockCommittee) HeightByTime(arg0 time.Time) (uint64, error) { +// ResultByHeight mocks base method. +func (m *MockCommittee) ResultByHeight(arg0 uint64) (*types.ElectionResult, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HeightByTime", arg0) - ret0, _ := ret[0].(uint64) + ret := m.ctrl.Call(m, "ResultByHeight", arg0) + ret0, _ := ret[0].(*types.ElectionResult) ret1, _ := ret[1].(error) return ret0, ret1 } -// HeightByTime indicates an expected call of HeightByTime -func (mr *MockCommitteeMockRecorder) HeightByTime(arg0 interface{}) *gomock.Call { +// ResultByHeight indicates an expected call of ResultByHeight. +func (mr *MockCommitteeMockRecorder) ResultByHeight(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeightByTime", reflect.TypeOf((*MockCommittee)(nil).HeightByTime), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResultByHeight", reflect.TypeOf((*MockCommittee)(nil).ResultByHeight), arg0) } -// LatestHeight mocks base method -func (m *MockCommittee) LatestHeight() uint64 { +// Start mocks base method. +func (m *MockCommittee) Start(arg0 context.Context) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LatestHeight") - ret0, _ := ret[0].(uint64) + ret := m.ctrl.Call(m, "Start", arg0) + ret0, _ := ret[0].(error) return ret0 } -// LatestHeight indicates an expected call of LatestHeight -func (mr *MockCommitteeMockRecorder) LatestHeight() *gomock.Call { +// Start indicates an expected call of Start. +func (mr *MockCommitteeMockRecorder) Start(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LatestHeight", reflect.TypeOf((*MockCommittee)(nil).LatestHeight)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockCommittee)(nil).Start), arg0) } -// Status mocks base method +// Status mocks base method. func (m *MockCommittee) Status() committee.STATUS { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Status") @@ -133,37 +155,22 @@ func (m *MockCommittee) Status() committee.STATUS { return ret0 } -// Status indicates an expected call of Status +// Status indicates an expected call of Status. func (mr *MockCommitteeMockRecorder) Status() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Status", reflect.TypeOf((*MockCommittee)(nil).Status)) } -// PutNativePollByEpoch mocks base method -func (m *MockCommittee) PutNativePollByEpoch(arg0 uint64, arg1 time.Time, arg2 []*types.Bucket) error { +// Stop mocks base method. +func (m *MockCommittee) Stop(arg0 context.Context) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "PutNativePollByEpoch", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "Stop", arg0) ret0, _ := ret[0].(error) return ret0 } -// PutNativePollByEpoch indicates an expected call of PutNativePollByEpoch -func (mr *MockCommitteeMockRecorder) PutNativePollByEpoch(arg0, arg1, arg2 interface{}) *gomock.Call { +// Stop indicates an expected call of Stop. +func (mr *MockCommitteeMockRecorder) Stop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutNativePollByEpoch", reflect.TypeOf((*MockCommittee)(nil).PutNativePollByEpoch), arg0, arg1, arg2) -} - -// NativeBucketsByEpoch mocks base method -func (m *MockCommittee) NativeBucketsByEpoch(arg0 uint64) ([]*types.Bucket, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NativeBucketsByEpoch", arg0) - ret0, _ := ret[0].([]*types.Bucket) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// NativeBucketsByEpoch indicates an expected call of NativeBucketsByEpoch -func (mr *MockCommitteeMockRecorder) NativeBucketsByEpoch(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NativeBucketsByEpoch", reflect.TypeOf((*MockCommittee)(nil).NativeBucketsByEpoch), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockCommittee)(nil).Stop), arg0) } diff --git a/util/util.go b/util/util.go index fad4a07..d27c940 100644 --- a/util/util.go +++ b/util/util.go @@ -30,7 +30,7 @@ const ( var ErrWrongType = errors.New("wrong data type held by interface{}") -//Uint64ToInt64 converts uint64 to int64 +// Uint64ToInt64 converts uint64 to int64 func Uint64ToInt64(u uint64) int64 { if u > uint64(maxInt) { zap.L().Panic("Height can't be converted to int64") @@ -38,12 +38,12 @@ func Uint64ToInt64(u uint64) int64 { return int64(u) } -//TimeToBytes converts time to []byte +// TimeToBytes converts time to []byte func TimeToBytes(t time.Time) ([]byte, error) { return t.MarshalBinary() } -//BytesToTime converts []byte to time +// BytesToTime converts []byte to time func BytesToTime(b []byte) (time.Time, error) { var t time.Time if err := t.UnmarshalBinary(b); err != nil { @@ -52,7 +52,7 @@ func BytesToTime(b []byte) (time.Time, error) { return t, nil } -//Uint64ToBytes converts uint64 to []byte +// Uint64ToBytes converts uint64 to []byte func Uint64ToBytes(u uint64) []byte { retval := make([]byte, 8) binary.LittleEndian.PutUint64(retval, u) @@ -60,12 +60,12 @@ func Uint64ToBytes(u uint64) []byte { return retval } -//BytesToUint64 converts []byte to uint64 +// BytesToUint64 converts []byte to uint64 func BytesToUint64(b []byte) uint64 { return binary.LittleEndian.Uint64(b) } -//CopyBytes copy []byte to another []byte +// CopyBytes copy []byte to another []byte func CopyBytes(b []byte) []byte { c := make([]byte, len(b)) copy(c, b)