[Refactoring] migrate evoDb to unique pointer

random-zebra · random-zebra · commit be85c9a7a612 · 2021-04-11T10:21:24.000+02:00
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
@@ -5,7 +5,7 @@
 
 #include "evodb.h"
 
-CEvoDB* evoDb;
+std::unique_ptr<CEvoDB> evoDb;
 
 CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
         db(GetDataDir() / "evodb", nCacheSize, fMemory, fWipe),
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
@@ -60,6 +60,6 @@ class CEvoDB
     }
 };
 
-extern CEvoDB* evoDb;
+extern std::unique_ptr<CEvoDB> evoDb;
 
 #endif//PIVX_EVODB_H
diff --git a/src/init.cpp b/src/init.cpp
@@ -298,8 +298,7 @@ void PrepareShutdown()
         zerocoinDB = NULL;
         delete pSporkDB;
         pSporkDB = NULL;
-        delete evoDb;
-        evoDb = nullptr;
+        evoDb.reset();
     }
 #ifdef ENABLE_WALLET
     if (pwalletMain)
@@ -1575,12 +1574,13 @@ bool AppInitMain()
                 delete pblocktree;
                 delete zerocoinDB;
                 delete pSporkDB;
-                delete evoDb;
 
                 //PIVX specific: zerocoin and spork DB's
                 zerocoinDB = new CZerocoinDB(0, false, fReindex);
                 pSporkDB = new CSporkDB(0, false, false);
-                evoDb = new CEvoDB(nEvoDbCache, false, fReindex);
+
+                evoDb.reset();
+                evoDb.reset(new CEvoDB(nEvoDbCache, false, fReindex));
 
                 pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
 
diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -47,11 +47,13 @@ BasicTestingSetup::BasicTestingSetup()
         InitSignatureCache();
         fCheckBlockIndex = true;
         SelectParams(CBaseChainParams::MAIN);
+        evoDb.reset(new CEvoDB(1 << 20, true, true));
 }
 BasicTestingSetup::~BasicTestingSetup()
 {
         ECC_Stop();
         g_connman.reset();
+        evoDb.reset();
 }
 
 TestingSetup::TestingSetup()
@@ -76,7 +78,6 @@ TestingSetup::TestingSetup()
         RegisterAllCoreRPCCommands(tableRPC);
         zerocoinDB = new CZerocoinDB(0, true);
         pSporkDB = new CSporkDB(0, true);
-        evoDb = new CEvoDB(1 << 20, true, true);
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
@@ -111,7 +112,6 @@ TestingSetup::~TestingSetup()
         delete pblocktree;
         delete zerocoinDB;
         delete pSporkDB;
-        delete evoDb;
         fs::remove_all(pathTemp);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,6 @@ class CEvoDB`
`60`	`60`	`}`
`61`	`61`	`};`
`62`	`62`
`63`		`-extern CEvoDB* evoDb;`
	`63`	`+extern std::unique_ptr<CEvoDB> evoDb;`
`64`	`64`
`65`	`65`	`#endif//PIVX_EVODB_H`