Fix signatures of GetLatestValue methods to match CLIP, re-run go gen…

…erate

pkg/loop/internal/chain_reader.go

@@ -15,22 +15,18 @@ type chainReaderClient struct {
 	grpc pb.ChainReaderClient
 }
 
-func (c *chainReaderClient) GetLatestValue(ctx context.Context, bc types.BoundContract, method string, params, retValues any) ([]byte, error) {
+func (c *chainReaderClient) GetLatestValue(ctx context.Context, bc types.BoundContract, method string, params, retVal any) error {
 	boundContract := pb.BoundContract{Name: bc.Name, Address: bc.Address, Pending: bc.Pending}
 	jsonParams, err := json.Marshal(params)
 	if err != nil {
-		return nil, err
-	}
-	jsonRetValues, err := json.Marshal(retValues)
-	if err != nil {
-		return nil, err
+		return err
 	}
 
-	reply, err := c.grpc.GetLatestValue(ctx, &pb.GetLatestValueRequest{Bc: &boundContract, Method: method, Params: jsonParams, ReturnValues: jsonRetValues})
+	reply, err := c.grpc.GetLatestValue(ctx, &pb.GetLatestValueRequest{Bc: &boundContract, Method: method, Params: jsonParams})
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return reply.RetValues, nil
+	return json.Unmarshal(reply.RetVal, &retVal)
 }
 
 var _ pb.ChainReaderServer = (*chainReaderServer)(nil)
@@ -45,11 +41,12 @@ func (c *chainReaderServer) GetLatestValue(ctx context.Context, request *pb.GetL
 	bc.Name = request.Bc.Name[:]
 	bc.Address = request.Bc.Address[:]
 	bc.Pending = request.Bc.Pending
-	retValues, err := c.impl.GetLatestValue(ctx, bc, request.Method, request.Params, request.ReturnValues)
+	var retVal []byte
+	err := c.impl.GetLatestValue(ctx, bc, request.Method, request.Params, &retVal)
 	if err != nil {
 		return nil, err
 	}
-	return &pb.GetLatestValueReply{RetValues: retValues}, nil
+	return &pb.GetLatestValueReply{RetVal: retVal}, nil
 }
 
 func (c *chainReaderServer) RegisterEventFilter(ctx context.Context, in *pb.RegisterEventFilterRequest) (*pb.RegisterEventFilterReply, error) {

pkg/loop/internal/pb/relayer.proto

@@ -291,7 +291,7 @@ message GetLatestValueRequest {
 
 // GetLatestValueReply has return arguments for [github.com/smartcontractkit/chainlink-relay/pkg/types.ChainReader.GetLatestValue].
 message GetLatestValueReply {
-  bytes retValues = 1;
+  bytes retVal = 1;
 }
 
 // BoundContract represents a [github.com/smartcontractkit/chainlink-relay/pkg/types.BoundContract].

pkg/loop/internal/test/config.go

@@ -3,7 +3,6 @@ package test
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
 	"math/big"
 	"time"
@@ -93,26 +92,23 @@ func (s staticContractTransmitter) FromAccount() (libocr.Account, error) {
 
 type staticChainReader struct{}
 
-func (c staticChainReader) GetLatestValue(ctx context.Context, bc types.BoundContract, method string, params, returnVal any) ([]byte, error) {
+func (c staticChainReader) GetLatestValue(ctx context.Context, bc types.BoundContract, method string, params, returnVal any) error {
 	if !assert.ObjectsAreEqual(bc, boundContract) {
-		return nil, fmt.Errorf("expected report context %v but got %v", boundContract, bc)
+		return fmt.Errorf("expected report context %v but got %v", boundContract, bc)
 	}
 	if method != medianContractGenericMethod {
-		return nil, fmt.Errorf("expected generic contract method %v but got %v", medianContractGenericMethod, method)
+		return fmt.Errorf("expected generic contract method %v but got %v", medianContractGenericMethod, method)
 	}
 	if !assert.ObjectsAreEqual(params, getLatestValueParams) {
-		return nil, fmt.Errorf("expected params %v but got %v", params, getLatestValueParams)
+		return fmt.Errorf("expected params %v but got %v", params, getLatestValueParams)
 	}
 
-	retStruct := struct {
+	returnVal = struct {
 		Epoch           uint32
 		Round           uint8
 		LatestAnswer    *big.Int
 		LatestTimestamp time.Time
 	}{epoch, round, latestAnswer, latestTimestamp}
-	ret, err := json.Marshal(retStruct)
-	if err != nil {
-		return nil, fmt.Errorf("Failed constructing static return data from GetLatestValue")
-	}
-	return ret, nil
+
+	return nil
 }

pkg/loop/internal/test/median.go

@@ -69,6 +69,16 @@ func TestReportingPluginFactory(t *testing.T, factory types.ReportingPluginFacto
 type StaticPluginMedian struct{}
 
 func (s StaticPluginMedian) NewMedianFactory(ctx context.Context, provider types.MedianProvider, dataSource, juelsPerFeeCoinDataSource median.DataSource, errorLog types.ErrorLog) (types.ReportingPluginFactory, error) {
+	cr := provider.ChainReader()
+	var gotTransmissionDetails LatestTransmissionDetails
+	err := cr.GetLatestValue(ctx, boundContract, "LatestTransmissionDetails", nil, gotTransmissionDetails)
+	if err != nil {
+		return nil, fmt.Errorf("failed to call GetLatestValue() on median provider: %w", err)
+	}
+	if gotTransmissionDetails != latestTransmissionDetails {
+		return nil, fmt.Errorf("expected LatestTransmissionDetails %v but got %v", gotTransmissionDetails, latestTransmissionDetails)
+	}
+
 	ocd := provider.OffchainConfigDigester()
 	gotDigestPrefix, err := ocd.ConfigDigestPrefix()
 	if err != nil {

pkg/loop/internal/test/test.go

@@ -17,6 +17,13 @@ const ConfigTOML = `[Foo]
 Bar = "Baz"
 `
 
+type LatestTransmissionDetails struct {
+	ConfigDigest libocr.ConfigDigest
+	Epoch        uint32
+	Round        uint8
+	Timestamp    time.Time
+}
+
 const (
 	account          = libocr.Account("testaccount")
 	balanceCheck     = true
@@ -41,10 +48,11 @@ var (
 		ID:     chainID,
 		Config: ConfigTOML,
 	}
-	chainID            = "chain-id"
-	configDigest       = libocr.ConfigDigest([32]byte{2: 10, 12: 16})
-	configDigestPrefix = libocr.ConfigDigestPrefix(99)
-	contractConfig     = libocr.ContractConfig{
+	chainID                   = "chain-id"
+	configDigest              = libocr.ConfigDigest([32]byte{2: 10, 12: 16})
+	configDigestPrefix        = libocr.ConfigDigestPrefix(99)
+	latestTransmissionDetails = LatestTransmissionDetails{ConfigDigest: configDigest, Epoch: epoch, Round: round, Timestamp: time.Now()}
+	contractConfig            = libocr.ContractConfig{
 		ConfigDigest:          configDigest,
 		ConfigCount:           42,
 		Signers:               []libocr.OnchainPublicKey{[]byte{15: 1}},

pkg/types/chain_reader.go

@@ -31,7 +31,7 @@ type ChainReader interface {
 	// json.Marshal(). Typically would be either an anonymous map such as `map[string]any{"baz": 42, "test": true}}` or something which implements the `MarshalJSON()` method (satisfying `Marshaller` interface).
 	//
 	// returnVal should satisfy Marshaller interface.
-	GetLatestValue(ctx context.Context, bc BoundContract, method string, params, returnVal any) ([]byte, error)
+	GetLatestValue(ctx context.Context, bc BoundContract, method string, params, returnVal any) error
 }
 
 type BoundContract struct {