BCFR-967 - EVM Chain bindings for CR/CW - Basic support for method

core/services/relay/evm/chain_components_test.go

@@ -206,15 +206,16 @@ func TestContractReaderEventsInitValidation(t *testing.T) {
 	}
 }
 
+//go:generate evm-chain-bindings -contracts contracts/src/v0.8/shared/test/helpers -output core/services/relay/evm/bindings
 func TestChainComponents(t *testing.T) {
 	t.Parallel()
 	it := &EVMChainComponentsInterfaceTester[*testing.T]{Helper: &helper{}}
-
-	it.Helper.Init(t)
+	it.Init(t)
 
 	// add new subtests here so that it can be run on real chains too
 	RunChainComponentsEvmTests(t, it)
 	RunChainComponentsInLoopEvmTests[*testing.T](t, commontestutils.WrapContractReaderTesterForLoop(it))
+	RunChainComponentsInLoopEvmTests(t, WrapContractReaderTesterWithBindings(t, it))
 }
 
 type helper struct {

core/services/relay/evm/chain_writer_historical_wrapper_test.go

@@ -2,6 +2,7 @@ package evm
 
 import (
 	"context"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/bindings"
 	"math/big"
 
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
@@ -22,18 +23,34 @@ func NewChainWriterHistoricalWrapper(cw commontypes.ChainWriter, cwh *ClientWith
 }
 
 func (cwhw *ChainWriterHistoricalWrapper) SubmitTransaction(ctx context.Context, contractName, method string, args any, transactionID string, toAddress string, meta *commontypes.TxMeta, value *big.Int) error {
-	if primArgs, ok := args.(interfacetesttypes.PrimitiveArgs); ok {
+	alterablePrimitiveCall, newValue := cwhw.getPrimitiveValueIfPossible(args)
+	if alterablePrimitiveCall {
 		callArgs := interfacetesttypes.ExpectedGetLatestValueArgs{
 			ContractName:    contractName,
 			ReadName:        "GetAlterablePrimitiveValue",
 			ConfidenceLevel: primitives.Unconfirmed,
 			Params:          nil,
 			ReturnVal:       nil,
 		}
-		err := cwhw.cwh.SetUintLatestValue(ctx, primArgs.Value, callArgs)
+		err := cwhw.cwh.SetUintLatestValue(ctx, newValue, callArgs)
 		if err != nil {
 			return err
 		}
 	}
 	return cwhw.ChainWriter.SubmitTransaction(ctx, contractName, method, args, transactionID, toAddress, meta, value)
 }
+
+func (cwhw *ChainWriterHistoricalWrapper) getPrimitiveValueIfPossible(args any) (bool, uint64) {
+	primitiveArgs, alterablePrimitiveCall := args.(interfacetesttypes.PrimitiveArgs)
+	var newValue uint64
+	var alterablePrimitiveValue bindings.SetAlterablePrimitiveValueInput
+	if alterablePrimitiveCall {
+		newValue = primitiveArgs.Value
+	} else {
+		alterablePrimitiveValue, alterablePrimitiveCall = args.(bindings.SetAlterablePrimitiveValueInput)
+		if alterablePrimitiveCall {
+			newValue = alterablePrimitiveValue.Value
+		}
+	}
+	return alterablePrimitiveCall, newValue
+}