Check Transaction Sender state

smartcontractkit · Sep 6, 2024 · 0037103 · 0037103
1 parent 30369a6
commit 0037103
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/common/client/transaction_sender.go b/common/client/transaction_sender.go
@@ -100,8 +100,9 @@ func (txSender *TransactionSender[TX, CHAIN_ID, RPC]) SendTransaction(ctx contex
 	txResultsToReport := make(chan sendTxResult)
 	primaryNodeWg := sync.WaitGroup{}
 
-	ctx, cancel := txSender.chStop.Ctx(ctx)
-	defer cancel()
+	if txSender.State() != "Started" {
+		return 0, errors.New("TransactionSender not started")
+	}
 
 	healthyNodesNum := 0
 	err := txSender.multiNode.DoAll(ctx, func(ctx context.Context, rpc RPC, isSendOnly bool) {
@@ -215,6 +216,8 @@ func (txSender *TransactionSender[TX, CHAIN_ID, RPC]) collectTxResults(ctx conte
 	if healthyNodesNum == 0 {
 		return Retryable, ErroringNodeError
 	}
+	ctx, cancel := txSender.chStop.Ctx(ctx)
+	defer cancel()
 	requiredResults := int(math.Ceil(float64(healthyNodesNum) * sendTxQuorum))
 	errorsByCode := sendTxResults{}
 	var softTimeoutChan <-chan time.Time

diff --git a/common/client/transaction_sender_test.go b/common/client/transaction_sender_test.go
@@ -239,7 +239,7 @@ func TestTransactionSender_SendTransaction(t *testing.T) {
 
 		require.NoError(t, txSender.Close())
 		_, err := txSender.SendTransaction(tests.Context(t), nil)
-		require.EqualError(t, err, "context canceled")
+		require.EqualError(t, err, "TransactionSender not started")
 	})
 	t.Run("Returns error if there is no healthy primary nodes", func(t *testing.T) {
 		chainID := types.RandomID()

diff --git a/core/chains/evm/client/chain_client_test.go b/core/chains/evm/client/chain_client_test.go
@@ -859,12 +859,13 @@ func TestEthClient_ErroringClient(t *testing.T) {
 	_, err = erroringClient.PendingNonceAt(ctx, common.Address{})
 	require.Equal(t, err, commonclient.ErroringNodeError)
 
+	txSenderNotStarted := errors.New("TransactionSender not started")
 	err = erroringClient.SendTransaction(ctx, nil)
-	require.Equal(t, err, commonclient.ErroringNodeError)
+	require.Equal(t, err, txSenderNotStarted)
 
 	code, err := erroringClient.SendTransactionReturnCode(ctx, nil, common.Address{})
 	require.Equal(t, code, commonclient.Unknown)
-	require.Equal(t, err, commonclient.ErroringNodeError)
+	require.Equal(t, err, txSenderNotStarted)
 
 	_, err = erroringClient.SequenceAt(ctx, common.Address{}, nil)
 	require.Equal(t, err, commonclient.ErroringNodeError)