From 1fd80c6f2be318b9da26a5ffea34326cc3f236fb Mon Sep 17 00:00:00 2001 From: Jaremy Creechley Date: Wed, 27 Sep 2023 13:12:32 -0700 Subject: [PATCH] fix merge --- datastore/threads/threadproxyds.nim | 2 +- tests/datastore/testthreadproxyds.nim | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/datastore/threads/threadproxyds.nim b/datastore/threads/threadproxyds.nim index b573bf1..422c548 100644 --- a/datastore/threads/threadproxyds.nim +++ b/datastore/threads/threadproxyds.nim @@ -204,7 +204,7 @@ method put*[BT](self: ThreadDatastore[BT], return ctx[].res.toRes() method put*[DB]( - self: ThreadDatastore, + self: ThreadDatastore[DB], batch: seq[BatchEntry]): Future[?!void] {.async.} = ## put batch data for entry in batch: diff --git a/tests/datastore/testthreadproxyds.nim b/tests/datastore/testthreadproxyds.nim index f415ba6..000c52d 100644 --- a/tests/datastore/testthreadproxyds.nim +++ b/tests/datastore/testthreadproxyds.nim @@ -63,7 +63,6 @@ for i in 1..N: key = Key.init("/a/b").tryGet() bytes = "some bytes".toBytes otherBytes = "some other bytes".toBytes - setup: sqlStore = newSQLiteBackend[KeyId, DataBuffer](Memory).tryGet()