From f7a3e90414ff883c712eb4dbe6e48aa55bede937 Mon Sep 17 00:00:00 2001 From: Chrysostomos Nanakos Date: Thu, 2 Oct 2025 17:16:59 +0300 Subject: [PATCH] refactor: remove makeRandomDataset helper function Remove makeRandomDataset in favor of direct composition with makeRandomBlocks and makeDataset. Part of https://github.com/codex-storage/nim-codex/issues/974 Signed-off-by: Chrysostomos Nanakos --- tests/codex/blockexchange/engine/testblockexc.nim | 2 +- tests/codex/helpers/datasetutils.nim | 10 ---------- tests/codex/stores/testrepostore.nim | 12 ++++++++---- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/codex/blockexchange/engine/testblockexc.nim b/tests/codex/blockexchange/engine/testblockexc.nim index 65e001f3..7c2a9ed8 100644 --- a/tests/codex/blockexchange/engine/testblockexc.nim +++ b/tests/codex/blockexchange/engine/testblockexc.nim @@ -198,7 +198,7 @@ asyncchecksuite "NetworkStore - dissemination": await nodes.stop() test "Should disseminate blocks across large diameter swarm": - let dataset = (await makeRandomDataset(nBlocks = 60, blockSize = 256'nb)).tryGet() + let dataset = makeDataset(await makeRandomBlocks(60 * 256, 256'nb)).tryGet() nodes = generateNodes( 6, diff --git a/tests/codex/helpers/datasetutils.nim b/tests/codex/helpers/datasetutils.nim index 14e914b1..56f26e34 100644 --- a/tests/codex/helpers/datasetutils.nim +++ b/tests/codex/helpers/datasetutils.nim @@ -14,10 +14,6 @@ proc makeRandomBlock*(size: NBytes): Block = let bytes = newSeqWith(size.int, rand(uint8)) Block.new(bytes).tryGet() -#proc makeRandomBlocks*(nBlocks: int, blockSize: NBytes): seq[Block] = -#for i in 0 ..< nBlocks: -#result.add(makeRandomBlock(blockSize)) - proc makeRandomBlocks*( datasetSize: int, blockSize: NBytes ): Future[seq[Block]] {.async.} = @@ -47,9 +43,3 @@ proc makeDataset*(blocks: seq[Block]): ?!TestDataset = ) return success((blocks, tree, manifest)) - -proc makeRandomDataset*( - nBlocks: int, blockSize: NBytes -): Future[?!TestDataset] {.async.} = - let blocks = await makeRandomBlocks(nBlocks * blockSize.int, blockSize) - makeDataset(blocks) diff --git a/tests/codex/stores/testrepostore.nim b/tests/codex/stores/testrepostore.nim index bb7ec110..7eb9fd0d 100644 --- a/tests/codex/stores/testrepostore.nim +++ b/tests/codex/stores/testrepostore.nim @@ -364,8 +364,10 @@ asyncchecksuite "RepoStore": let repo = RepoStore.new(repoDs, metaDs, clock = mockClock, quotaMaxBytes = 1000'nb) - (blocks, tree, manifest) = - (await makeRandomDataset(nBlocks = 2, blockSize = 256'nb)).tryGet() + (blocks, tree, manifest) = makeDataset( + await makeRandomBlocks(datasetSize = 2 * 256, blockSize = 256'nb) + ) + .tryGet() blk = blocks[0] treeCid = tree.rootCid.tryGet() proof = tree.getProof(0).tryGet() @@ -381,8 +383,10 @@ asyncchecksuite "RepoStore": let repo = RepoStore.new(repoDs, metaDs, clock = mockClock, quotaMaxBytes = 1000'nb) - (blocks, tree, manifest) = - (await makeRandomDataset(nBlocks = 2, blockSize = 256'nb)).tryGet() + (blocks, tree, manifest) = makeDataset( + await makeRandomBlocks(datasetSize = 2 * 256, blockSize = 256'nb) + ) + .tryGet() blk = blocks[0] treeCid = tree.rootCid.tryGet() proof = tree.getProof(0).tryGet()