From bd86433679750ff1221ee7af0f6752b2d17c9574 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Fri, 27 Aug 2021 16:11:33 -0600 Subject: [PATCH] fix chunker tests --- dagger/chunker.nim | 2 +- tests/dagger/dataset.nim | 20 -------------------- tests/dagger/testchunking.nim | 3 ++- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 tests/dagger/dataset.nim diff --git a/dagger/chunker.nim b/dagger/chunker.nim index a5ae36af..c1922f10 100644 --- a/dagger/chunker.nim +++ b/dagger/chunker.nim @@ -70,7 +70,7 @@ iterator items*(c: Chunker): seq[byte] = yield chunk -func new( +func new*( T: type Chunker, kind = ChunkerType.SizedChunker, reader: Reader, diff --git a/tests/dagger/dataset.nim b/tests/dagger/dataset.nim deleted file mode 100644 index ab01ef03..00000000 --- a/tests/dagger/dataset.nim +++ /dev/null @@ -1,20 +0,0 @@ -import std/sequtils - -import pkg/chronos -import pkg/asynctest -import pkg/stew/results -import pkg/dagger/chunker -import pkg/dagger/merkletree -import pkg/stew/byteutils -import pkg/dagger/p2p/rng -import pkg/dagger/blocktype as bt - -suite "Data set": - - test "Make from Blocks": - let - chunker = newRandomChunker(Rng.instance(), size = 256*3, chunkSize = 256) - blocks = chunker.mapIt( bt.Block.new(it) ) - - let merkle = MerkleTreeRef.fromBlocks(blocks) - diff --git a/tests/dagger/testchunking.nim b/tests/dagger/testchunking.nim index 82dace73..767a9c4c 100644 --- a/tests/dagger/testchunking.nim +++ b/tests/dagger/testchunking.nim @@ -4,7 +4,8 @@ import pkg/dagger/chunker suite "Chunking": test "should return proper size chunks": - proc reader(data: var openArray[byte], offset: Natural = 0): int {.gcsafe, closure.} = + proc reader(data: var openArray[byte], offset: Natural = 0): int + {.gcsafe, closure, raises: [Defect].} = let contents = "1234567890".toBytes copyMem(addr data[0], unsafeAddr contents[offset], data.len) return data.len