restructure loop condition

smartcontractkit · Sep 20, 2024 · 70bc529 · 70bc529
1 parent 34760fd
commit 70bc529
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/integration-tests/deployment/ccip/view/v1_5/tokenadminregistry.go b/integration-tests/deployment/ccip/view/v1_5/tokenadminregistry.go
@@ -41,14 +41,15 @@ func GenerateTokenAdminRegistryView(taContract *token_admin_registry.TokenAdminR
 func getAllConfiguredTokensPaginated(taContract *token_admin_registry.TokenAdminRegistry) ([]common.Address, error) {
 	startIndex := uint64(0)
 	allTokens := make([]common.Address, 0)
-	fetchedTokens := make([]common.Address, 0)
-	for len(fetchedTokens) < GetTokensPaginationSize {
+	for {
 		fetchedTokens, err := taContract.GetAllConfiguredTokens(nil, startIndex, GetTokensPaginationSize)
 		if err != nil {
 			return nil, err
 		}
 		allTokens = append(allTokens, fetchedTokens...)
 		startIndex += GetTokensPaginationSize
+		if len(fetchedTokens) < GetTokensPaginationSize {
+			return allTokens, nil
+		}
 	}
-	return allTokens, nil
 }