-blocksdir: keep blockindex leveldb database in datadir

jonasschnelli · furszy · commit a4ff899bb86d · 2021-04-27T22:11:55.000-03:00
diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -159,7 +159,7 @@ size_t CCoinsViewDB::EstimateSize() const
     return db.EstimateSize(DB_COIN, (char)(DB_COIN+1));
 }
 
-CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWrapper(GetBlocksDir() / "index", nCacheSize, fMemory, fWipe)
+CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWrapper(gArgs.IsArgSet("-blocksdir") ? GetDataDir() / "blocks" / "index" : GetBlocksDir() / "index", nCacheSize, fMemory, fWipe)
 {
 }
 
diff --git a/test/functional/feature_blocksdir.py b/test/functional/feature_blocksdir.py
@@ -27,8 +27,8 @@ def run_test(self):
         self.start_node(0, ["-blocksdir="+self.options.tmpdir+ "/blocksdir"])
         self.log.info("mining blocks..")
         self.nodes[0].generate(10)
-        assert(os.path.isfile(self.options.tmpdir+ "/blocksdir/regtest/blocks/blk00000.dat"))
-        assert(os.path.isdir(self.options.tmpdir+ "/blocksdir/regtest/blocks/index"))
+        assert(os.path.isfile(os.path.join(self.options.tmpdir, "blocksdir", "regtest", "blocks", "blk00000.dat")))
+        assert(os.path.isdir(os.path.join(self.options.tmpdir, "node0", "regtest", "blocks", "index")))
 
 if __name__ == '__main__':
     BlocksdirTest().main()

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ size_t CCoinsViewDB::EstimateSize() const`
`159`	`159`	`return db.EstimateSize(DB_COIN, (char)(DB_COIN+1));`
`160`	`160`	`}`
`161`	`161`
`162`		`-CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWrapper(GetBlocksDir() / "index", nCacheSize, fMemory, fWipe)`
	`162`	`+CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWrapper(gArgs.IsArgSet("-blocksdir") ? GetDataDir() / "blocks" / "index" : GetBlocksDir() / "index", nCacheSize, fMemory, fWipe)`
`163`	`163`	`{`
`164`	`164`	`}`
`165`	`165`