Updated mocks. Linted. Fixed test

Author: durkmurder

Makefile

@@ -156,7 +156,7 @@ generate-mocks: install-mock-generators
 	mockery --name '.*' --dir=engine/execution/computation/computer --case=underscore --output="./engine/execution/computation/computer/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/execution/state --case=underscore --output="./engine/execution/state/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/collection --case=underscore --output="./engine/collection/mock" --outpkg="mock"
-	mockery --name '.*' --dir=engine/common --case=underscore --output="./engine/common/mock" --outpkg="mock"
+	mockery --name 'complianceCore' --dir=engine/common/follower --exported --case=underscore --output="./engine/common/follower/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/common/follower/cache --case=underscore --output="./engine/common/follower/cache/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/consensus --case=underscore --output="./engine/consensus/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/consensus/approvals --case=underscore --output="./engine/consensus/approvals/mock" --outpkg="mock"

engine/common/follower/compliance_engine_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/onflow/flow-go/consensus/hotstuff/model"
-	commonmock "github.com/onflow/flow-go/engine/common/mock"
+	followermock "github.com/onflow/flow-go/engine/common/follower/mock"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/messages"
 	"github.com/onflow/flow-go/module/irrecoverable"
@@ -37,7 +37,7 @@ type EngineSuite struct {
 	con       *mocknetwork.Conduit
 	me        *module.Local
 	headers   *storage.Headers
-	core      *commonmock.FollowerCore
+	core      *followermock.ComplianceCore
 
 	ctx    irrecoverable.SignalerContext
 	cancel context.CancelFunc
@@ -52,7 +52,7 @@ func (s *EngineSuite) SetupTest() {
 	s.me = module.NewLocal(s.T())
 	s.headers = storage.NewHeaders(s.T())
 
-	s.core = commonmock.NewFollowerCore(s.T())
+	s.core = followermock.NewComplianceCore(s.T())
 	s.core.On("Start", mock.Anything).Return().Once()
 	unittest.ReadyDoneify(s.core)
 
@@ -195,7 +195,7 @@ func (s *EngineSuite) TestProcessFinalizedBlock() {
 	// lower than finalized height
 	metricsMock := module.NewEngineMetrics(s.T())
 	metricsMock.On("MessageReceived", mock.Anything, metrics.MessageSyncedBlocks).Return().Once()
-	metricsMock.On("MessageHandled", mock.Anything, metrics.MessageBlockProposal).Run(func(_ mock.Arguments) {
+	metricsMock.On("MessageHandled", mock.Anything, metrics.MessageSyncedBlocks).Run(func(_ mock.Arguments) {
 		close(done)
 	}).Return().Once()
 	s.engine.engMetrics = metricsMock

engine/common/mock/follower_core.go …/common/follower/mock/compliance_core.goengine/common/mock/follower_core.go renamed to engine/common/follower/mock/compliance_core.go engine/common/mock/follower_core.go renamed to engine/common/follower/mock/compliance_core.go

@@ -71,7 +71,7 @@ type FollowerState interface {
 // All blocks are validated in full, including payload validation, prior to insertion. Only valid blocks are inserted.
 type ParticipantState interface {
 	FollowerState
-	
+
 	// Extend introduces the block with the given ID into the persistent
 	// protocol state without modifying the current finalized state. It allows
 	// us to execute fork-aware queries against ambiguous protocol state, while