From 6136eb608d97fb0cd42fa63abd430f7f50d89951 Mon Sep 17 00:00:00 2001
From: Tomasz Bekas <tomasz.bekas@gmail.com>
Date: Wed, 8 May 2024 19:23:31 +0200
Subject: [PATCH] Addressing review comments by Dmitriy

---
 datastore/typedds.nim                  | 15 +++++----------
 tests/datastore/typeddscommontests.nim |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/datastore/typedds.nim b/datastore/typedds.nim
index 648fa52..d9a8fcc 100644
--- a/datastore/typedds.nim
+++ b/datastore/typedds.nim
@@ -20,7 +20,7 @@ import ./datastore
 ##   import pkg/questionable
 ##
 ##   let
-##     tds = ds.asTypedDs()
+##     tds = TypeDatastore.init(ds)
 ##     key = Key.init("p").tryGet()
 ##
 ##   type Person = object
@@ -54,17 +54,13 @@ type
 
 # Helpers
 template requireDecoder*(T: typedesc): untyped =
-  when (compiles do:
+  when not (compiles do:
     let _: ?!T = T.decode(newSeq[byte]())):
-    discard
-  else:
     {.error: "provide a decoder: `proc decode(T: type " & $T & ", bytes: seq[byte]): ?!T`".}
 
 template requireEncoder*(T: typedesc): untyped =
-  when (compiles do:
+  when not (compiles do:
     let _: seq[byte] = encode(default(T))):
-    discard
-  else:
     {.error: "provide an encoder: `proc encode(a: " & $T & "): seq[byte]`".}
 
 # Original Datastore API
@@ -83,11 +79,10 @@ proc delete*(self: TypedDatastore, keys: seq[Key]): Future[?!void] {.async.} =
 proc close*(self: TypedDatastore): Future[?!void] {.async.} =
   await self.ds.close()
 
-# Conversion Datastore -> TypeDatastore
-proc asTypedDs*(ds: Datastore): TypedDatastore =
+# TypedDatastore API
+proc init*(T: type TypedDatastore, ds: Datastore): T =
   TypedDatastore(ds: ds)
 
-# TypedDatastore API
 proc put*[T](self: TypedDatastore, key: Key, t: T): Future[?!void] {.async.} =
   requireEncoder(T)
 
diff --git a/tests/datastore/typeddscommontests.nim b/tests/datastore/typeddscommontests.nim
index bcc5734..ae8c4fd 100644
--- a/tests/datastore/typeddscommontests.nim
+++ b/tests/datastore/typeddscommontests.nim
@@ -33,7 +33,7 @@ proc typedDsTests*(
   key: Key,
   dsCount = 1) =
 
-  let tds: TypedDatastore = ds.asTypedDs()
+  let tds = TypedDatastore.init(ds)
 
   test "should put a value":
     (await tds.put(key, 11)).tryGet()
@@ -102,7 +102,7 @@ proc typedDsTests*(
 
 proc typedDsQueryTests*(ds: Datastore) =
 
-  let tds = ds.asTypedDs()
+  let tds = TypedDatastore.init(ds)
 
   test "should query values":
     let