Merge branch 'develop' into BLADE-161-account-management-implementation

Ethernal-Tech · Jun 20, 2024 · ae95579 · ae95579
2 parents bc0daea + 81f9898
commit ae95579
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/txpool/txpool_test.go b/txpool/txpool_test.go
@@ -3908,10 +3908,13 @@ func TestBatchTx_SingleAccount(t *testing.T) {
 	go func() {
 		defer wg.Done()
 
+		ctx, cancelFn := context.WithTimeout(context.Background(), time.Second*15)
+		defer cancelFn()
+
 		for {
 			select {
 			case ev = <-subscription.subscriptionChannel:
-			case <-time.After(time.Second * 6):
+			case <-ctx.Done():
 				timeoutElapsed = true
 
 				return
@@ -3936,7 +3939,7 @@ func TestBatchTx_SingleAccount(t *testing.T) {
 				assert.Equal(t, defaultMaxAccountEnqueued, pool.Length())
 
 				// all transactions are promoted
-				break
+				return
 			}
 		}
 	}()