diff --git a/.circleci/config.yml b/.circleci/config.yml index 945264ed..4496d58a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: - run: name: Install mockgen command: | - go install github.com/golang/mock/mockgen@v1.5.0 + go install go.uber.org/mock/mockgen@latest - save_cache: key: go-mod-v4-{{ checksum "go.sum" }} paths: diff --git a/README.md b/README.md index 7d8eae25..87d171d6 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Running the following commands will generate the `akita-cli` binary: ### How to test -1. Install [gomock](https://github.com/golang/mock): `go get github.com/golang/mock/mockgen` +1. Install [gomock](https://github.com/uber-go/mock): `go get go.uber.org/mock/gomock` 2. `make test` ### How to use diff --git a/go.mod b/go.mod index 11c06649..05549f3c 100644 --- a/go.mod +++ b/go.mod @@ -96,6 +96,7 @@ require ( github.com/spf13/jwalterweatherman v1.0.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect + go.uber.org/mock v0.3.0 // indirect golang.org/x/net v0.7.0 // indirect golang.org/x/sys v0.5.0 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/go.sum b/go.sum index 91906993..e1cb9611 100644 --- a/go.sum +++ b/go.sum @@ -437,6 +437,8 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= +go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/trace/backend_collector_test.go b/trace/backend_collector_test.go index f49d7f89..19333ff0 100644 --- a/trace/backend_collector_test.go +++ b/trace/backend_collector_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/golang/protobuf/proto" "github.com/google/uuid" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" mockrest "github.com/akitasoftware/akita-cli/rest/mock" pb "github.com/akitasoftware/akita-ir/go/api_spec" @@ -33,8 +33,8 @@ type witnessRecorder struct { } // Record a call to LearnClient.AsyncReportsUpload -func (wr *witnessRecorder) recordAsyncReportsUpload(args ...interface{}) { - reports := args[2].(*kgxapi.UploadReportsRequest) +func (wr *witnessRecorder) recordAsyncReportsUpload(arg0, arg1, arg2 interface{}) { + reports := arg2.(*kgxapi.UploadReportsRequest) for _, r := range reports.Witnesses { bs, err := base64.URLEncoding.DecodeString(r.WitnessProto) if err != nil {