nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fake_core: Check if hard fork subdbs need reset at start

Browse Source
This commit is contained in:
warptangent 2016-02-04 20:09:51 -08:00
parent c657e772c4
commit f7e337e625
No known key found for this signature in database
GPG Key ID: 0E490BEBFBE4E92D
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -2450,8 +2450,14 @@ void BlockchainLMDB::check_hard_fork_info()
throw0(DB_ERROR("Failed to query m_hf_starting_heights")); throw0(DB_ERROR("Failed to query m_hf_starting_heights"));
if (db_stat1.ms_entries != db_stat2.ms_entries) if (db_stat1.ms_entries != db_stat2.ms_entries)
{ {
mdb_drop(*txn_ptr, m_hf_starting_heights, 1); // Empty, but don't delete. This allows this function to be called after
mdb_drop(*txn_ptr, m_hf_versions, 1); // startup, after the subdbs have already been created, and rest of startup
// can proceed. If these don't exist, hard fork's init() will fail.
//
// If these are empty, hard fork's init() will repopulate the hard fork
// data.
mdb_drop(*txn_ptr, m_hf_starting_heights, 0);
mdb_drop(*txn_ptr, m_hf_versions, 0);
} }
TXN_POSTFIX_SUCCESS(); TXN_POSTFIX_SUCCESS();

3
src/blockchain_utilities/fake_core.h
View File

@ -75,7 +75,10 @@ struct fake_core_lmdb
throw; throw;
} }
db->check_hard_fork_info();
m_storage.init(db, use_testnet); m_storage.init(db, use_testnet);
if (do_batch) if (do_batch)
m_storage.get_db().set_batch_transactions(do_batch); m_storage.get_db().set_batch_transactions(do_batch);
support_batch = true; support_batch = true;