mirror of
https://github.com/monero-project/monero.git
synced 2025-08-22 23:45:04 -04:00
Merge pull request #531
cbded43
core_tests: fix ring_signature_1 tests (moneromooo-monero)c3d208f
core_tests: bump default test fee to 0.02 monero (moneromooo-monero)10da0a0
add a --fakechain argument for tests (moneromooo-monero)eee44e6
unit_tests: fix block reward test using post hard fork settings (moneromooo-monero)595893f
blockchain: log block (not chain) height in "BLOCK SUCCESFULLY ADDED" (moneromooo-monero)2369968
blockchain: fix off by one in get_blocks (moneromooo-monero)8af913a
db_lmdb: implement BlockchainLMDB::reset (moneromooo-monero)4833f4f
db_bdb: implement BlockchainBDB::reset (moneromooo-monero)18bf06e
tx_pool: fix "minumim" typo in message (moneromooo-monero)44f1267
tests: fix a typo in test name (moneromooo-monero)1494557
db_lmdb: create all needed directories, not just the leaf one (moneromooo-monero)015b68a
db_bdb: create all needed directories, not just the leaf one (moneromooo-monero)f141869
tests: remove data-dir argument registration (moneromooo-monero)
This commit is contained in:
commit
bdf738bc7f
13 changed files with 124 additions and 41 deletions
|
@ -943,7 +943,7 @@ void BlockchainLMDB::open(const std::string& filename, const int mdb_flags)
|
|||
}
|
||||
else
|
||||
{
|
||||
if (!boost::filesystem::create_directory(direc))
|
||||
if (!boost::filesystem::create_directories(direc))
|
||||
throw0(DB_OPEN_FAILURE(std::string("Failed to create directory ").append(filename).c_str()));
|
||||
}
|
||||
|
||||
|
@ -1159,7 +1159,33 @@ void BlockchainLMDB::sync()
|
|||
void BlockchainLMDB::reset()
|
||||
{
|
||||
LOG_PRINT_L3("BlockchainLMDB::" << __func__);
|
||||
// TODO: this
|
||||
check_open();
|
||||
|
||||
mdb_txn_safe txn;
|
||||
if (mdb_txn_begin(m_env, NULL, 0, txn))
|
||||
throw0(DB_ERROR("Failed to create a transaction for the db"));
|
||||
mdb_drop(txn, m_blocks, 0);
|
||||
mdb_drop(txn, m_block_timestamps, 0);
|
||||
mdb_drop(txn, m_block_heights, 0);
|
||||
mdb_drop(txn, m_block_hashes, 0);
|
||||
mdb_drop(txn, m_block_sizes, 0);
|
||||
mdb_drop(txn, m_block_diffs, 0);
|
||||
mdb_drop(txn, m_block_coins, 0);
|
||||
mdb_drop(txn, m_txs, 0);
|
||||
mdb_drop(txn, m_tx_unlocks, 0);
|
||||
mdb_drop(txn, m_tx_heights, 0);
|
||||
mdb_drop(txn, m_tx_outputs, 0);
|
||||
mdb_drop(txn, m_output_txs, 0);
|
||||
mdb_drop(txn, m_output_indices, 0);
|
||||
mdb_drop(txn, m_output_amounts, 0);
|
||||
mdb_drop(txn, m_output_keys, 0);
|
||||
mdb_drop(txn, m_spent_keys, 0);
|
||||
mdb_drop(txn, m_hf_starting_heights, 0);
|
||||
mdb_drop(txn, m_hf_versions, 0);
|
||||
mdb_drop(txn, m_properties, 0);
|
||||
txn.commit();
|
||||
m_height = 0;
|
||||
m_num_outputs = 0;
|
||||
}
|
||||
|
||||
std::vector<std::string> BlockchainLMDB::get_filenames() const
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue