Merge branch 'develop' into bug/fix-batch-tx-encoding

smartcontractkit · Dec 15, 2023 · 0fc4c3d · 0fc4c3d
2 parents 07994cc + e12a38c
commit 0fc4c3d
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/core/chains/evm/txmgr/confirmer_test.go b/core/chains/evm/txmgr/confirmer_test.go
@@ -2984,13 +2984,19 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr.ID, minConfirmations, etx.ID)
 
+		done := make(chan struct{})
+		t.Cleanup(func() { <-done })
 		go func() {
+			defer close(done)
 			err2 := ec.ResumePendingTaskRuns(testutils.Context(t), &head)
-			require.NoError(t, err2)
+			if !assert.NoError(t, err2) {
+				return
+			}
 			// Retrieve Tx to check if callback completed flag was set to true
 			updateTx, err3 := txStore.FindTxWithSequence(testutils.Context(t), fromAddress, nonce)
-			require.NoError(t, err3)
-			require.Equal(t, true, updateTx.CallbackCompleted)
+			if assert.NoError(t, err3) {
+				assert.Equal(t, true, updateTx.CallbackCompleted)
+			}
 		}()
 
 		select {
@@ -3032,13 +3038,19 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr.ID, minConfirmations, etx.ID)
 
+		done := make(chan struct{})
+		t.Cleanup(func() { <-done })
 		go func() {
+			defer close(done)
 			err2 := ec.ResumePendingTaskRuns(testutils.Context(t), &head)
-			require.NoError(t, err2)
+			if !assert.NoError(t, err2) {
+				return
+			}
 			// Retrieve Tx to check if callback completed flag was set to true
 			updateTx, err3 := txStore.FindTxWithSequence(testutils.Context(t), fromAddress, nonce)
-			require.NoError(t, err3)
-			require.Equal(t, true, updateTx.CallbackCompleted)
+			if assert.NoError(t, err3) {
+				assert.Equal(t, true, updateTx.CallbackCompleted)
+			}
 		}()
 
 		select {