monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 04:29:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #18 from moneromooo-monero/blockchain

Browse source 
Blockchain
This commit is contained in:
Thomas Winget 2014-12-31 16:35:48 -05:00 committed by warptangent
commit 4fa1a83f6e
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/blockchain_converter/blockchain_converter.cpp
View file

@ -59,7 +59,12 @@ struct fake_core
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
boost::filesystem::path default_data_path {tools::get_default_data_dir()}; std::string dir = tools::get_default_data_dir();
boost::filesystem::path default_data_path {dir};
if (argc >= 2 && !strcmp(argv[1], "--testnet")) {
default_data_path /= "testnet";
}
fake_core c(default_data_path); fake_core c(default_data_path);
BlockchainDB *blockchain; BlockchainDB *blockchain;

16
src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp
View file

@ -1162,12 +1162,9 @@ tx_out BlockchainLMDB::get_output(const crypto::hash& h, const uint64_t& index)
mdb_cursor_get(cur, &k, &v, MDB_FIRST_DUP); mdb_cursor_get(cur, &k, &v, MDB_FIRST_DUP);
if (index != 0) for (uint64_t i = 0; i < index; ++i)
{ {
for (uint64_t i = 0; i < index; ++i) mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP);
{
mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP);
}
} }
mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT); mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT);
@ -1264,12 +1261,9 @@ tx_out_index BlockchainLMDB::get_output_tx_and_index(const uint64_t& amount, con
mdb_cursor_get(cur, &k, &v, MDB_FIRST_DUP); mdb_cursor_get(cur, &k, &v, MDB_FIRST_DUP);
if (index != 0) for (uint64_t i = 0; i < index; ++i)
{ {
for (uint64_t i = 0; i < index; ++i) mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP);
{
mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP);
}
} }
mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT); mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT);
@ -1310,9 +1304,9 @@ std::vector<uint64_t> BlockchainLMDB::get_tx_output_indices(const crypto::hash&
for (uint64_t i = 0; i < num_elems; ++i) for (uint64_t i = 0; i < num_elems; ++i)
{ {
mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP);
mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT); mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT);
index_vec.push_back(*(const uint64_t *)v.mv_data); index_vec.push_back(*(const uint64_t *)v.mv_data);
mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP);
} }
cur.close(); cur.close();