-blocksdir: keep blockindex leveldb database in datadir

This commit is contained in:
Jonas Schnelli 2018-03-11 12:42:02 +08:00
parent f38e4fdb06
commit a1926362ec
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
2 changed files with 3 additions and 3 deletions

View File

@ -147,7 +147,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) {
}
bool CBlockTreeDB::ReadBlockFileInfo(int nFile, CBlockFileInfo &info) {

View File

@ -27,8 +27,8 @@ class BlocksdirTest(BitcoinTestFramework):
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()