bump framework; remove generic result type

core/chains/evm/client/chain_client.go

@@ -2,7 +2,6 @@ package client
 
 import (
 	"context"
-	"errors"
 	"math/big"
 	"sync"
 	"time"
@@ -101,7 +100,7 @@ type chainClient struct {
 		*big.Int,
 		*RPCClient,
 	]
-	txSender     *multinode.TransactionSender[*types.Transaction, *SendTxResult, *big.Int, *RPCClient]
+	txSender     *multinode.TransactionSender[*types.Transaction, *big.Int, *RPCClient]
 	logger       logger.SugaredLogger
 	chainType    chaintype.ChainType
 	clientErrors evmconfig.ClientErrors
@@ -130,12 +129,12 @@ func NewChainClient(
 		deathDeclarationDelay,
 	)
 
-	txSender := multinode.NewTransactionSender[*types.Transaction, *SendTxResult, *big.Int, *RPCClient](
+	txSender := multinode.NewTransactionSender[*types.Transaction, *big.Int, *RPCClient](
 		lggr,
 		chainID,
 		chainFamily,
 		multiNode,
-		NewSendTxResult,
+		func(err error) multinode.SendTxReturnCode { return 0 },
 		0, // use the default value provided by the implementation
 	)
 
@@ -373,20 +372,16 @@ func (c *chainClient) PendingNonceAt(ctx context.Context, account common.Address
 }
 
 func (c *chainClient) SendTransaction(ctx context.Context, tx *types.Transaction) error {
-	var result *SendTxResult
 	if c.chainType == chaintype.ChainHedera {
 		activeRPC, err := c.multiNode.SelectRPC()
 		if err != nil {
 			return err
 		}
-		result = activeRPC.SendTransaction(ctx, tx)
-	} else {
-		result = c.txSender.SendTransaction(ctx, tx)
-	}
-	if result == nil {
-		return errors.New("SendTransaction failed: result is nil")
+		_, err = activeRPC.SendTransaction(ctx, tx)
+		return err
 	}
-	return result.Error()
+	_, err := c.txSender.SendTransaction(ctx, tx)
+	return err
 }
 
 func (c *chainClient) SendTransactionReturnCode(ctx context.Context, tx *types.Transaction, fromAddress common.Address) (multinode.SendTxReturnCode, error) {

core/chains/evm/client/rpc_client.go

@@ -123,7 +123,7 @@ type RPCClient struct {
 }
 
 var _ multinode.RPCClient[*big.Int, *evmtypes.Head] = (*RPCClient)(nil)
-var _ multinode.SendTxRPCClient[*types.Transaction, *SendTxResult] = (*RPCClient)(nil)
+var _ multinode.SendTxRPCClient[*types.Transaction] = (*RPCClient)(nil)
 
 func NewRPCClient(
 	cfg config.NodePool,
@@ -808,29 +808,7 @@ func (r *RPCClient) BlockByNumberGeth(ctx context.Context, number *big.Int) (blo
 	return
 }
 
-type SendTxResult struct {
-	err  error
-	code multinode.SendTxReturnCode
-}
-
-var _ multinode.SendTxResult = (*SendTxResult)(nil)
-
-func NewSendTxResult(err error) *SendTxResult {
-	result := &SendTxResult{
-		err: err,
-	}
-	return result
-}
-
-func (r *SendTxResult) Error() error {
-	return r.err
-}
-
-func (r *SendTxResult) Code() multinode.SendTxReturnCode {
-	return r.code
-}
-
-func (r *RPCClient) SendTransaction(ctx context.Context, tx *types.Transaction) *SendTxResult {
+func (r *RPCClient) SendTransaction(ctx context.Context, tx *types.Transaction) (multinode.SendTxReturnCode, error) {
 	ctx, cancel, ws, http := r.makeLiveQueryCtxAndSafeGetClients(ctx, r.largePayloadRPCTimeout)
 	defer cancel()
 	lggr := r.newRqLggr().With("tx", tx)
@@ -847,10 +825,7 @@ func (r *RPCClient) SendTransaction(ctx context.Context, tx *types.Transaction)
 
 	r.logResult(lggr, err, duration, r.getRPCDomain(), "SendTransaction")
 
-	return &SendTxResult{
-		err:  err,
-		code: ClassifySendError(err, r.clientErrors, logger.Sugared(logger.Nop()), tx, common.Address{}, r.chainType.IsL2()),
-	}
+	return ClassifySendError(err, r.clientErrors, logger.Sugared(logger.Nop()), tx, common.Address{}, r.chainType.IsL2()), err
 }
 
 func (r *RPCClient) SimulateTransaction(ctx context.Context, tx *types.Transaction) error {

core/chains/evm/client/rpc_client_test.go

@@ -651,8 +651,8 @@ func TestRpcClientLargePayloadTimeout(t *testing.T) {
 		{
 			Name: "SendTransaction",
 			Fn: func(ctx context.Context, rpc *client.RPCClient) error {
-				result := rpc.SendTransaction(ctx, types.NewTx(&types.LegacyTx{}))
-				return result.Error()
+				_, err := rpc.SendTransaction(ctx, types.NewTx(&types.LegacyTx{}))
+				return err
 			},
 		},
 		{