From ef5a30f7d311f82075164d18e6c60fac6873804d Mon Sep 17 00:00:00 2001 From: Jaremy Creechley Date: Wed, 27 Sep 2023 18:27:29 -0700 Subject: [PATCH] refactor tests --- datastore/fsds.nim | 3 ++- datastore/threads/databuffer.nim | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/datastore/fsds.nim b/datastore/fsds.nim index 459b860..a49f800 100644 --- a/datastore/fsds.nim +++ b/datastore/fsds.nim @@ -111,12 +111,13 @@ proc readFile[V](self: FSDatastore, path: string): ?!V = when V is seq[byte]: var bytes = newSeq[byte](size) elif V is DataBuffer: - var bytes = DataBuffer.new(capacity=size) + var bytes = DataBuffer.new(size=size) else: {.error: "unhandled result type".} var read = 0 + echo "BYTES: ", bytes.repr while read < size: read += file.readBytes(bytes.toOpenArray(), read, size) diff --git a/datastore/threads/databuffer.nim b/datastore/threads/databuffer.nim index 1b5e6d2..3cb414a 100644 --- a/datastore/threads/databuffer.nim +++ b/datastore/threads/databuffer.nim @@ -47,14 +47,14 @@ template `==`*[T: char | byte](a: DataBuffer, b: openArray[T]): bool = elif a[].size != b.len: false else: a.hash() == b.hash() -proc new*(tp: type DataBuffer, capacity: int = 0): DataBuffer = +proc new*(tp: type DataBuffer, size: int = 0): DataBuffer = ## allocate new buffer with given capacity ## newSharedPtr(DataBufferHolder( - buf: cast[typeof(result[].buf)](allocShared0(capacity)), - size: 0, - cap: capacity, + buf: cast[typeof(result[].buf)](allocShared0(size)), + size: size, + cap: size, )) proc new*[T: byte | char](tp: type DataBuffer, data: openArray[T], opts: set[DataBufferOpt] = {}): DataBuffer =