Merge branch 'master' of github.com:novacoin-project/novacoin

[novacoin.git] / src / txdb-leveldb.h

diff --git a/src/txdb-leveldb.h b/src/txdb-leveldb.h
index ab3f9ee..07c7088 100644 (file)
--- a/src/txdb-leveldb.h
+++ b/src/txdb-leveldb.h
@@ -42,11 +42,13 @@ public:
 
 private:
     leveldb::DB *pdb;  // Points to the global instance.
+
     // A batch stores up writes and deletes for atomic application. When this
     // field is non-NULL, writes/deletes go there instead of directly to disk.
     leveldb::WriteBatch *activeBatch;
     leveldb::Options options;
     bool fReadOnly;
+    int nVersion;
 
 protected:
     // Returns true and sets (value,false) if activeBatch contains the given key
@@ -89,7 +91,7 @@ protected:
                                 SER_DISK, CLIENT_VERSION);
             ssValue >> value;
         }
-        catch (std::exception &e) {
+        catch (const std::exception&) {
             return false;
         }
         return true;
@@ -199,23 +201,10 @@ public:
     bool WriteSyncCheckpoint(uint256 hashCheckpoint);
     bool ReadCheckpointPubKey(std::string& strPubKey);
     bool WriteCheckpointPubKey(const std::string& strPubKey);
+    bool ReadModifierUpgradeTime(unsigned int& nUpgradeTime);
+    bool WriteModifierUpgradeTime(const unsigned int& nUpgradeTime);
     bool LoadBlockIndex();
-private:
-    bool LoadBlockIndexGuts();
 };
 
-// Called from the initialization code. Checks to see if there is an old
-// blkindex.dat file. If so, deletes it and begins re-importing the block
-// chain, which will create the new database.
-enum LevelDBMigrationResult {
-  NONE_NEEDED,
-  INSUFFICIENT_DISK_SPACE,
-  COMPLETED,
-  OTHER_ERROR,
-};
-
-typedef boost::signals2::signal<void (double progress)> LevelDBMigrationProgress;
-
-LevelDBMigrationResult MaybeMigrateToLevelDB(LevelDBMigrationProgress &progress);
 
 #endif // BITCOIN_DB_H