Fix tests

smartcontractkit · Jul 24, 2024 · b624b38 · b624b38
1 parent 39246c1
commit b624b38
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/pkg/capabilities/consensus/ocr3/reporting_plugin_test.go b/pkg/capabilities/consensus/ocr3/reporting_plugin_test.go
@@ -320,8 +320,7 @@ func TestReportingPlugin_Reports_ShouldReportFalse(t *testing.T) {
 	assert.Len(t, gotRep.Report, 0)
 
 	ib := gotRep.Info
-	info := &pbtypes.ReportInfo{}
-	err = proto.Unmarshal(ib, info)
+	info, err := extractReportInfo(ib)
 	require.NoError(t, err)
 
 	assert.EqualExportedValues(t, info.Id, id)
@@ -397,8 +396,7 @@ func TestReportingPlugin_Reports_ShouldReportTrue(t *testing.T) {
 	require.Equal(t, nm, fp)
 
 	ib := gotRep.Info
-	info := &pbtypes.ReportInfo{}
-	err = proto.Unmarshal(ib, info)
+	info, err := extractReportInfo(ib)
 	require.NoError(t, err)
 
 	assert.EqualExportedValues(t, info.Id, id)

diff --git a/pkg/capabilities/consensus/ocr3/testdata/fixtures/capability/schema.json b/pkg/capabilities/consensus/ocr3/testdata/fixtures/capability/schema.json
@@ -43,6 +43,9 @@
         },
         "request_timeout_ms": {
           "type": "integer"
+        },
+        "key_id": {
+          "type": "string"
         }
       },
       "additionalProperties": false,
@@ -53,7 +56,8 @@
         "encoder",
         "encoder_config",
         "report_id",
-        "request_timeout_ms"
+        "request_timeout_ms",
+        "key_id"
       ]
     },
     "inputs": {

diff --git a/pkg/capabilities/consensus/ocr3/transmitter.go b/pkg/capabilities/consensus/ocr3/transmitter.go
@@ -2,8 +2,10 @@ package ocr3
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/binary"
 	"encoding/hex"
+	"errors"
 	"fmt"
 
 	"github.com/smartcontractkit/libocr/offchainreporting2/types"
@@ -41,21 +43,22 @@ func extractReportInfo(data []byte) (*pbtypes.ReportInfo, error) {
 
 	im := info.AsMap()
 	ri, ok := im["reportInfo"]
-	if ok {
-		return nil, err
+	if !ok {
+		return nil, errors.New("could not fetch reportInfo from structpb")
 	}
 
-	rib, ok := ri.([]byte)
+	ris, ok := ri.(string)
 	if !ok {
-		return nil, err
+		return nil, errors.New("reportInfo is not bytes")
 	}
 
-	reportInfo := &pbtypes.ReportInfo{}
-	err = proto.Unmarshal(rib, reportInfo)
+	rib, err := base64.StdEncoding.DecodeString(ris)
 	if err != nil {
 		return nil, err
 	}
 
+	reportInfo := &pbtypes.ReportInfo{}
+	err = proto.Unmarshal([]byte(rib), reportInfo)
 	return reportInfo, err
 }
 

diff --git a/pkg/capabilities/consensus/ocr3/transmitter_test.go b/pkg/capabilities/consensus/ocr3/transmitter_test.go
@@ -79,7 +79,7 @@ func TestTransmitter(t *testing.T) {
 		},
 		ShouldReport: true,
 	}
-	infob, err := proto.Marshal(info)
+	infob, err := marshalReportInfo(info, "evm")
 	require.NoError(t, err)
 
 	sp := values.Proto(values.NewString("hello"))
@@ -162,7 +162,7 @@ func TestTransmitter_ShouldReportFalse(t *testing.T) {
 		},
 		ShouldReport: false,
 	}
-	infob, err := proto.Marshal(info)
+	infob, err := marshalReportInfo(info, "evm")
 	require.NoError(t, err)
 
 	sp := values.Proto(values.NewString("hello"))