Migrate to mockery packagess feature.

.mockery.yaml

@@ -0,0 +1,16 @@
+with-expecter: true
+filename: "{{.InterfaceName | snakecase}}.go"
+dir: "internal/mocks"
+outpkg: "mocks"
+packages:
+    github.com/smartcontractkit/chainlink-ccip/execute/types:
+        interfaces:
+            TokenDataReader:
+    github.com/smartcontractkit/chainlink-ccip/execute/internal/gen:
+        interfaces:
+            ExecutePluginCodec:
+    github.com/smartcontractkit/chainlink-ccip/internal/reader:
+        interfaces:
+            HomeChain:
+              config:
+                dir: "internal/reader/mocks"

Makefile

@@ -5,7 +5,7 @@ build: ensure_go_version
 	go build -v ./...
 
 generate: ensure_go_version
-	go generate ./...
+	mockery
 
 test: ensure_go_version
 	go test -race -fullpath -shuffle on -count $(TEST_COUNT) -coverprofile=$(COVERAGE_FILE) ./...

execute/internal/gen/codec.go

@@ -0,0 +1,7 @@
+package gen
+
+import cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
+
+type ExecutePluginCodec interface {
+	cciptypes.ExecutePluginCodec
+}

execute/plugin_e2e_test.go

@@ -73,7 +73,7 @@ type nodeSetup struct {
 	node            *Plugin
 	reportCodec     *mocks.ExecutePluginJSONReportCodec
 	msgHasher       cciptypes.MessageHasher
-	TokenDataReader *mocks.TokenDataReader
+	TokenDataReader *mocks.MockTokenDataReader
 }
 
 func setupHomeChainPoller(lggr logger.Logger, chainConfigInfos []reader.ChainConfigInfo) reader.HomeChain {
@@ -200,7 +200,7 @@ func setupSimpleTest(
 	err = homeChain.Start(ctx)
 	require.NoError(t, err, "failed to start home chain poller")
 
-	tokenDataReader := mocks.NewTokenDataReader(t)
+	tokenDataReader := mocks.NewMockTokenDataReader(t)
 	tokenDataReader.On("ReadTokenData", mock.Anything, mock.Anything, mock.Anything).Return([][]byte{}, nil)
 
 	oracleIDToP2pID := GetP2pIDs(1, 2, 3)

execute/plugin_test.go

@@ -320,7 +320,7 @@ func TestPlugin_Outcome_BelowF(t *testing.T) {
 }
 
 func TestPlugin_Outcome_HomeChainError(t *testing.T) {
-	homeChain := reader_mock.NewHomeChain(t)
+	homeChain := reader_mock.NewMockHomeChain(t)
 	homeChain.On("GetFChain", mock.Anything).Return(nil, fmt.Errorf("test error"))
 
 	p := &Plugin{
@@ -332,7 +332,7 @@ func TestPlugin_Outcome_HomeChainError(t *testing.T) {
 }
 
 func TestPlugin_Outcome_CommitReportsMergeError(t *testing.T) {
-	homeChain := reader_mock.NewHomeChain(t)
+	homeChain := reader_mock.NewMockHomeChain(t)
 	fChainMap := map[cciptypes.ChainSelector]int{
 		10: 20,
 	}
@@ -358,7 +358,7 @@ func TestPlugin_Outcome_CommitReportsMergeError(t *testing.T) {
 }
 
 func TestPlugin_Outcome_MessagesMergeError(t *testing.T) {
-	homeChain := reader_mock.NewHomeChain(t)
+	homeChain := reader_mock.NewMockHomeChain(t)
 	fChainMap := map[cciptypes.ChainSelector]int{
 		10: 20,
 	}
@@ -397,7 +397,7 @@ func TestPlugin_Reports_UnableToParse(t *testing.T) {
 }
 
 func TestPlugin_Reports_UnableToEncode(t *testing.T) {
-	codec := mocks.NewExecutePluginCodec(t)
+	codec := mocks.NewMockExecutePluginCodec(t)
 	codec.On("Encode", mock.Anything, mock.Anything).
 		Return(nil, fmt.Errorf("test error"))
 	p := &Plugin{reportCodec: codec}
@@ -410,7 +410,7 @@ func TestPlugin_Reports_UnableToEncode(t *testing.T) {
 }
 
 func TestPlugin_ShouldAcceptAttestedReport_DoesNotDecode(t *testing.T) {
-	codec := mocks.NewExecutePluginCodec(t)
+	codec := mocks.NewMockExecutePluginCodec(t)
 	codec.On("Decode", mock.Anything, mock.Anything).
 		Return(cciptypes.ExecutePluginReport{}, fmt.Errorf("test error"))
 	p := &Plugin{
@@ -422,7 +422,7 @@ func TestPlugin_ShouldAcceptAttestedReport_DoesNotDecode(t *testing.T) {
 }
 
 func TestPlugin_ShouldAcceptAttestedReport_NoReports(t *testing.T) {
-	codec := mocks.NewExecutePluginCodec(t)
+	codec := mocks.NewMockExecutePluginCodec(t)
 	codec.On("Decode", mock.Anything, mock.Anything).
 		Return(cciptypes.ExecutePluginReport{}, nil)
 	p := &Plugin{
@@ -435,7 +435,7 @@ func TestPlugin_ShouldAcceptAttestedReport_NoReports(t *testing.T) {
 }
 
 func TestPlugin_ShouldAcceptAttestedReport_ShouldAccept(t *testing.T) {
-	codec := mocks.NewExecutePluginCodec(t)
+	codec := mocks.NewMockExecutePluginCodec(t)
 	codec.On("Decode", mock.Anything, mock.Anything).
 		Return(cciptypes.ExecutePluginReport{
 			ChainReports: []cciptypes.ExecutePluginReportSingleChain{
@@ -487,9 +487,9 @@ func TestPlugin_ShouldTransmitAcceptReport_Ineligible(t *testing.T) {
 }
 
 func TestPlugin_ShouldTransmitAcceptReport_DecodeFailure(t *testing.T) {
-	homeChain := reader_mock.NewHomeChain(t)
+	homeChain := reader_mock.NewMockHomeChain(t)
 	homeChain.On("GetSupportedChainsForPeer", mock.Anything).Return(mapset.NewSet(cciptypes.ChainSelector(1)), nil)
-	codec := mocks.NewExecutePluginCodec(t)
+	codec := mocks.NewMockExecutePluginCodec(t)
 	codec.On("Decode", mock.Anything, mock.Anything).
 		Return(cciptypes.ExecutePluginReport{}, fmt.Errorf("test error"))
 
@@ -511,9 +511,9 @@ func TestPlugin_ShouldTransmitAcceptReport_DecodeFailure(t *testing.T) {
 
 func TestPlugin_ShouldTransmitAcceptReport_Success(t *testing.T) {
 	lggr, logs := logger.TestObserved(t, zapcore.DebugLevel)
-	homeChain := reader_mock.NewHomeChain(t)
+	homeChain := reader_mock.NewMockHomeChain(t)
 	homeChain.On("GetSupportedChainsForPeer", mock.Anything).Return(mapset.NewSet(cciptypes.ChainSelector(1)), nil)
-	codec := mocks.NewExecutePluginCodec(t)
+	codec := mocks.NewMockExecutePluginCodec(t)
 	codec.On("Decode", mock.Anything, mock.Anything).
 		Return(cciptypes.ExecutePluginReport{}, nil)