[CAPPL-60] Use new EncoderFactory interface in ocr3 capability

core/capabilities/encoder_factory.go

@@ -0,0 +1,20 @@
+package capabilities
+
+import (
+	"fmt"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/values"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
+)
+
+func NewEncoder(name string, config *values.Map, lggr logger.Logger) (types.Encoder, error) {
+	switch name {
+	case "EVM":
+		return evm.NewEVMEncoder(config)
+	// TODO: add a "no-op" encoder for users who only want to use dynamic ones?
+	default:
+		return nil, fmt.Errorf("encoder %s not supported", name)
+	}
+}

core/capabilities/integration_tests/setup.go

@@ -41,7 +41,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
 	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/testutils/heavyweight"
 )
@@ -153,7 +152,7 @@ func createDons(ctx context.Context, t *testing.T, lggr logger.Logger, reportsSi
 		requestTimeout := 10 * time.Minute
 		cfg := ocr3.Config{
 			Logger:            lggr,
-			EncoderFactory:    evm.NewEVMEncoder,
+			EncoderFactory:    capabilities.NewEncoder,
 			AggregatorFactory: capabilities.NewAggregator,
 			RequestTimeout:    &requestTimeout,
 		}

plugins/cmd/chainlink-ocr3-capability/main.go

@@ -11,7 +11,6 @@ import (
 	ocr3rp "github.com/smartcontractkit/chainlink-common/pkg/loop/reportingplugins/ocr3"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 )
 
 const (
@@ -24,7 +23,7 @@ func main() {
 
 	c := ocr3.Config{
 		Logger:            s.Logger,
-		EncoderFactory:    evm.NewEVMEncoder,
+		EncoderFactory:    capabilities.NewEncoder,
 		AggregatorFactory: capabilities.NewAggregator,
 	}
 	p := ocr3.NewOCR3(c)