Merge pull request #953

240864f db_lmdb: errors dropping hf starting height db on reset are not fatal (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-08-11 14:58:04 +02:00
commit cb17c4da4f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -1242,8 +1242,7 @@ void BlockchainLMDB::reset()
throw0(DB_ERROR(lmdb_error("Failed to drop m_output_amounts: ", result).c_str())); throw0(DB_ERROR(lmdb_error("Failed to drop m_output_amounts: ", result).c_str()));
if (auto result = mdb_drop(txn, m_spent_keys, 0)) if (auto result = mdb_drop(txn, m_spent_keys, 0))
throw0(DB_ERROR(lmdb_error("Failed to drop m_spent_keys: ", result).c_str())); throw0(DB_ERROR(lmdb_error("Failed to drop m_spent_keys: ", result).c_str()));
if (auto result = mdb_drop(txn, m_hf_starting_heights, 0)) (void)mdb_drop(txn, m_hf_starting_heights, 0); // this one is dropped in new code
throw0(DB_ERROR(lmdb_error("Failed to drop m_hf_starting_heights: ", result).c_str()));
if (auto result = mdb_drop(txn, m_hf_versions, 0)) if (auto result = mdb_drop(txn, m_hf_versions, 0))
throw0(DB_ERROR(lmdb_error("Failed to drop m_hf_versions: ", result).c_str())); throw0(DB_ERROR(lmdb_error("Failed to drop m_hf_versions: ", result).c_str()));
if (auto result = mdb_drop(txn, m_properties, 0)) if (auto result = mdb_drop(txn, m_properties, 0))