monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 21:19:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1646

Browse source 
95f3e193 Update and use blockchain data files defines (Miguel Herranz)
This commit is contained in:
Riccardo Spagni 2017-02-02 21:34:31 +02:00
commit 3aa008e4c6
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/blockchain_db/lmdb/db_lmdb.cpp
View file

@ -1056,10 +1056,11 @@ void BlockchainLMDB::open(const std::string& filename, const int mdb_flags)
// check for existing LMDB files in base directory // check for existing LMDB files in base directory
boost::filesystem::path old_files = direc.parent_path(); boost::filesystem::path old_files = direc.parent_path();
if (boost::filesystem::exists(old_files / "data.mdb") || boost::filesystem::exists(old_files / "lock.mdb")) if (boost::filesystem::exists(old_files / CRYPTONOTE_BLOCKCHAINDATA_FILENAME)
|| boost::filesystem::exists(old_files / CRYPTONOTE_BLOCKCHAINDATA_LOCK_FILENAME))
{ {
LOG_PRINT_L0("Found existing LMDB files in " << old_files.string()); LOG_PRINT_L0("Found existing LMDB files in " << old_files.string());
LOG_PRINT_L0("Move data.mdb and/or lock.mdb to " << filename << ", or delete them, and then restart"); LOG_PRINT_L0("Move " << CRYPTONOTE_BLOCKCHAINDATA_FILENAME << " and/or " << CRYPTONOTE_BLOCKCHAINDATA_LOCK_FILENAME << " to " << filename << ", or delete them, and then restart");
throw DB_ERROR("Database could not be opened"); throw DB_ERROR("Database could not be opened");
} }
@ -1313,9 +1314,9 @@ std::vector<std::string> BlockchainLMDB::get_filenames() const
std::vector<std::string> filenames; std::vector<std::string> filenames;
boost::filesystem::path datafile(m_folder); boost::filesystem::path datafile(m_folder);
datafile /= "data.mdb"; datafile /= CRYPTONOTE_BLOCKCHAINDATA_FILENAME;
boost::filesystem::path lockfile(m_folder); boost::filesystem::path lockfile(m_folder);
lockfile /= "lock.mdb"; lockfile /= CRYPTONOTE_BLOCKCHAINDATA_LOCK_FILENAME;
filenames.push_back(datafile.string()); filenames.push_back(datafile.string());
filenames.push_back(lockfile.string()); filenames.push_back(lockfile.string());

4
src/cryptonote_config.h
View file

@ -120,8 +120,8 @@
#define CRYPTONOTE_NAME "bitmonero" #define CRYPTONOTE_NAME "bitmonero"
#define CRYPTONOTE_POOLDATA_FILENAME "poolstate.bin" #define CRYPTONOTE_POOLDATA_FILENAME "poolstate.bin"
#define CRYPTONOTE_BLOCKCHAINDATA_FILENAME "blockchain.bin" #define CRYPTONOTE_BLOCKCHAINDATA_FILENAME "data.mdb"
#define CRYPTONOTE_BLOCKCHAINDATA_TEMP_FILENAME "blockchain.bin.tmp" #define CRYPTONOTE_BLOCKCHAINDATA_LOCK_FILENAME "lock.mdb"
#define P2P_NET_DATA_FILENAME "p2pstate.bin" #define P2P_NET_DATA_FILENAME "p2pstate.bin"
#define MINER_CONFIG_FILE_NAME "miner_conf.json" #define MINER_CONFIG_FILE_NAME "miner_conf.json"