From 1092403bdeaa97c4a5909f18c61e986f36904622 Mon Sep 17 00:00:00 2001 From: mickychang9 Date: Mon, 29 Sep 2025 16:44:42 +0800 Subject: [PATCH] refactor: use the built-in min to simplify the code Signed-off-by: mickychang9 --- services/friendbot/init_friendbot.go | 5 +---- services/ticker/internal/scraper/asset_scraper.go | 5 +---- services/ticker/internal/tickerdb/queries_trade.go | 6 +----- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/services/friendbot/init_friendbot.go b/services/friendbot/init_friendbot.go index bbfd1ded16..86e5eec58a 100644 --- a/services/friendbot/init_friendbot.go +++ b/services/friendbot/init_friendbot.go @@ -84,10 +84,7 @@ func createMinionAccounts(botAccount internal.Account, botKeypair *keypair.Full, return minions, errors.Wrap(rerr, "refreshing bot seqnum") } // The tx will create min(numRemainingMinions, minionBatchSize) Minion accounts. - numCreateMinions := minionBatchSize - if numRemainingMinions < minionBatchSize { - numCreateMinions = numRemainingMinions - } + numCreateMinions := min(numRemainingMinions, minionBatchSize) log.Printf("Creating %d new minion accounts", numCreateMinions) for i := 0; i < numCreateMinions; i++ { minionKeypair, err := keypair.Random() diff --git a/services/ticker/internal/scraper/asset_scraper.go b/services/ticker/internal/scraper/asset_scraper.go index 0bbc82452a..0e49eb64b1 100644 --- a/services/ticker/internal/scraper/asset_scraper.go +++ b/services/ticker/internal/scraper/asset_scraper.go @@ -272,10 +272,7 @@ func (c *ScraperConfig) parallelProcessAssets(assets []hProtocol.AssetStat, para go func(start int) { defer wg.Done() - end := start + chunkSize - if end > numAssets { - end = numAssets - } + end := min(start+chunkSize, numAssets) // Each routine running concurrently has a separate cache of TOMLs // loaded. A single shared cache would be better, but this is a diff --git a/services/ticker/internal/tickerdb/queries_trade.go b/services/ticker/internal/tickerdb/queries_trade.go index 8a5cc5db70..368972a5a3 100644 --- a/services/ticker/internal/tickerdb/queries_trade.go +++ b/services/ticker/internal/tickerdb/queries_trade.go @@ -48,11 +48,7 @@ func chunkifyDBTrades(sl []Trade, chunkSize int) [][]Trade { length := len(sl) for i := 0; i < numChunks; i++ { - end := start + chunkSize - - if end > length { - end = length - } + end := min(start+chunkSize, length) chunk := sl[start:end] chunkedSlice = append(chunkedSlice, chunk) start = end