2 files changed, 25 insertions, 4 deletions

diff --git a/common/storage.h b/common/storage.h
index 53fcf41..4535ae3 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -85,7 +85,6 @@ public:
          */
         bool write(const QByteArray &key, const QByteArray &value, const std::function<void(const DataStore::Error &error)> &errorHandler = std::function<void(const DataStore::Error &error)>());
 
-        // TODO: change resultHandlers and errorHandlers to take size_t instead
         // of QByteArray for keys
         bool write(const size_t key, const QByteArray &value, const std::function<void(const DataStore::Error &error)> &errorHandler = std::function<void(const DataStore::Error &error)>());
 
@@ -127,6 +126,9 @@ public:
         void findLatest(const QByteArray &uid, const std::function<void(const QByteArray &key, const QByteArray &value)> &resultHandler,
             const std::function<void(const DataStore::Error &error)> &errorHandler = std::function<void(const DataStore::Error &error)>()) const;
 
+        void findLatest(size_t key, const std::function<void(size_t key, const QByteArray &value)> &resultHandler,
+            const std::function<void(const DataStore::Error &error)> &errorHandler = std::function<void(const DataStore::Error &error)>()) const;
+
         /**
          * Finds all the keys and values whose keys are in a given range
          * (inclusive).
@@ -137,7 +139,7 @@ public:
                 std::function<void(const DataStore::Error &error)>()) const;
 
         int findAllInRange(const size_t lowerBound, const size_t upperBound,
-            const std::function<void(const QByteArray &key, const QByteArray &value)> &resultHandler,
+            const std::function<void(size_t key, const QByteArray &value)> &resultHandler,
             const std::function<void(const DataStore::Error &error)> &errorHandler = {}) const;
 
         /**
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 981d4ef..6afa1a8 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -573,6 +573,20 @@ int DataStore::NamedDatabase::scan(const QByteArray &k, const std::function<bool
     return numberOfRetrievedValues;
 }
 
+
+void DataStore::NamedDatabase::findLatest(size_t key,
+    const std::function<void(size_t key, const QByteArray &value)> &resultHandler,
+    const std::function<void(const DataStore::Error &error)> &errorHandler) const
+{
+    auto baKey = sizeTToByteArray(key);
+    return findLatest(baKey,
+        [&resultHandler](const QByteArray &key, const QByteArray &value) {
+            size_t integerKey = byteArrayToSizeT(value);
+            resultHandler(integerKey, value);
+        },
+        errorHandler);
+}
+
 void DataStore::NamedDatabase::findLatest(const QByteArray &k, const std::function<void(const QByteArray &key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler) const
 {
@@ -647,12 +661,17 @@ void DataStore::NamedDatabase::findLatest(const QByteArray &k, const std::functi
 }
 
 int DataStore::NamedDatabase::findAllInRange(const size_t lowerBound, const size_t upperBound,
-    const std::function<void(const QByteArray &key, const QByteArray &value)> &resultHandler,
+    const std::function<void(size_t key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler) const
 {
     auto baLowerBound = sizeTToByteArray(lowerBound);
     auto baUpperBound = sizeTToByteArray(upperBound);
-    return findAllInRange(baLowerBound, baUpperBound, resultHandler, errorHandler);
+    return findAllInRange(baLowerBound, baUpperBound,
+        [&resultHandler](const QByteArray &key, const QByteArray &value) {
+            size_t integerKey = byteArrayToSizeT(value);
+            resultHandler(integerKey, value);
+        },
+        errorHandler);
 }
 
 int DataStore::NamedDatabase::findAllInRange(const QByteArray &lowerBound, const QByteArray &upperBound,