2 files changed, 17 insertions, 25 deletions

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 283205f..8e9b05c 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -28,11 +28,11 @@ public:
 };
 
 Storage::Private::Private(const QString &s, const QString &n)
-    : transaction(0),
+    : storageRoot(s),
+      name(n),
+      transaction(0),
       readTransaction(false),
-      firstOpen(true),
-      storageRoot(s),
-      name(n)
+      firstOpen(true)
 {
     QDir dir;
     dir.mkdir(storageRoot);
@@ -148,7 +148,7 @@ void Storage::abortTransaction()
 
 bool Storage::write(const char *key, size_t keySize, const char *value, size_t valueSize)
 {
-    write(std::string(key, keySize), std::string(value, valueSize));
+    return write(std::string(key, keySize), std::string(value, valueSize));
 }
 
 bool Storage::write(const std::string &sKey, const std::string &sValue)
@@ -269,13 +269,6 @@ qint64 Storage::diskUsage() const
 
 void Storage::removeFromDisk() const
 {
-    QDir dir(d->path);
-    dir.remove("data.mdb");
-    dir.remove("lock.mdb");
-}
-
-void Storage::removeFromDisk() const
-{
     QDir dir(d->storageRoot);
     dir.remove("data.mdb");
     dir.remove("lock.mdb");
diff --git a/tests/storagetest.cpp b/tests/storagetest.cpp
index 2b2805d..242e424 100644
--- a/tests/storagetest.cpp
+++ b/tests/storagetest.cpp
@@ -38,13 +38,13 @@ private:
         bool success = true;
         bool keyMatch = true;
         const auto reference = keyPrefix + std::to_string(i);
-        success = storage.read(keyPrefix + std::to_string(i), [&error, &reference](const std::string &value) {
+        success = storage.read(keyPrefix + std::to_string(i), [&keyMatch, &reference](const std::string &value) {
             if (value != reference) {
                 qDebug() << "Mismatch while reading";
                 keyMatch = false;
             }
         });
-        return succes && keyMatch;
+        return success && keyMatch;
     }
 
 private Q_SLOTS:
@@ -56,11 +56,10 @@ private Q_SLOTS:
 
     void cleanupTestCase()
     {
-        Database db(testDataPath, dbName);
-        db.removeFromDisk();
+        Storage storage(testDataPath, dbName);
+        storage.removeFromDisk();
     }
 
-
     void testRead()
     {
         const int count = 100;
@@ -69,14 +68,14 @@ private Q_SLOTS:
 
         //ensure we can read everything back correctly
         {
-            Database db(testDataPath, dbName);
+            Storage storage(testDataPath, dbName);
             for (int i = 0; i < count; i++) {
-                QVERIFY(verify(db, i));
+                QVERIFY(verify(storage, i));
             }
         }
 
-        Database db(testDataPath, dbName);
-        db.removeFromDisk();
+        Storage storage(testDataPath, dbName);
+        storage.removeFromDisk();
     }
 
     void testConcurrentRead()
@@ -90,9 +89,9 @@ private Q_SLOTS:
         const int concurrencyLevel = 4;
         for (int num = 0; num < concurrencyLevel; num++) {
             futures << QtConcurrent::run([this, count](){
-                Database db(testDataPath, dbName);
+                Storage storage(testDataPath, dbName);
                 for (int i = 0; i < count; i++) {
-                    if (!verify(db, i)) {
+                    if (!verify(storage, i)) {
                         qWarning() << "invalid value";
                         break;
                     }
@@ -103,8 +102,8 @@ private Q_SLOTS:
             future.waitForFinished();
         }
 
-        Database db(testDataPath, dbName);
-        db.removeFromDisk();
+        Storage storage(testDataPath, dbName);
+        storage.removeFromDisk();
     }
 };