[FAB-8151] Enable latest mock-gen

Change-Id: I85ae6422aa2f5cc20417fdd54b0fa7131ad4bb51 Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Feb 8, 2018 · 95e3a32 · 95e3a32
1 parent 115de64
commit 95e3a32
Show file tree

Hide file tree

Showing 8 changed files with 304 additions and 318 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -6,7 +6,7 @@
 
 [[constraint]]
   name = "github.com/golang/mock"
-  version = "1.0.0"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/spf13/viper"

diff --git a/Makefile b/Makefile
@@ -124,9 +124,6 @@ FABRIC_TOOLS_DEVSTABLE_TAG  := DEV_STABLE
 # The version of dep that will be installed by depend-install (or in the CI)
 GO_DEP_COMMIT := v0.4.1
 
-# The version of mockgen that will be installed by depend-install
-GO_MOCKGEN_COMMIT := v1.0.0
-
 # Detect CI
 # TODO introduce nightly and adjust verify
 ifdef JENKINS_URL

diff --git a/api/apiconfig/mocks/mockconfig.gen.go b/api/apiconfig/mocks/mockconfig.gen.go
diff --git a/api/apifabca/mocks/mockfabriccaclient.gen.go b/api/apifabca/mocks/mockfabriccaclient.gen.go
diff --git a/api/apifabclient/mocks/mockfabclient.gen.go b/api/apifabclient/mocks/mockfabclient.gen.go