Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

blockchain_utilities: simplify getting block blob from height

Browse Source
This commit is contained in:
moneromooo-monero 2018-10-22 16:03:57 +00:00
parent 2287fb9fb4
commit cb4aafd27e
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/blockchain_utilities/blockchain_ancestry.cpp
View File

@ -407,8 +407,7 @@ int main(int argc, char* argv[])
for (uint64_t h = state.height; h < db_height; ++h) for (uint64_t h = state.height; h < db_height; ++h)
{ {
size_t block_ancestry_size = 0; size_t block_ancestry_size = 0;
const crypto::hash block_hash = db->get_block_hash_from_height(h); const cryptonote::blobdata bd = db->get_block_blob_from_height(h);
const cryptonote::blobdata bd = db->get_block_blob(block_hash);
++total_blocks; ++total_blocks;
cryptonote::block b; cryptonote::block b;
if (!cryptonote::parse_and_validate_block_from_blob(bd, b)) if (!cryptonote::parse_and_validate_block_from_blob(bd, b))
@ -482,8 +481,7 @@ int main(int argc, char* argv[])
} }
else else
{ {
const crypto::hash block_hash = db->get_block_hash_from_height(od.height); cryptonote::blobdata bd = db->get_block_blob_from_height(od.height);
cryptonote::blobdata bd = db->get_block_blob(block_hash);
if (!cryptonote::parse_and_validate_block_from_blob(bd, b)) if (!cryptonote::parse_and_validate_block_from_blob(bd, b))
{ {
LOG_PRINT_L0("Bad block from db"); LOG_PRINT_L0("Bad block from db");
@ -620,8 +618,7 @@ int main(int argc, char* argv[])
} }
else else
{ {
const crypto::hash block_hash = db->get_block_hash_from_height(opt_height); const cryptonote::blobdata bd = db->get_block_blob_from_height(opt_height);
const cryptonote::blobdata bd = db->get_block_blob(block_hash);
cryptonote::block b; cryptonote::block b;
if (!cryptonote::parse_and_validate_block_from_blob(bd, b)) if (!cryptonote::parse_and_validate_block_from_blob(bd, b))
{ {
@ -678,8 +675,7 @@ int main(int argc, char* argv[])
{ {
add_ancestor(ancestry, amount, offset); add_ancestor(ancestry, amount, offset);
const output_data_t od = db->get_output_key(amount, offset); const output_data_t od = db->get_output_key(amount, offset);
const crypto::hash block_hash = db->get_block_hash_from_height(od.height); bd = db->get_block_blob_from_height(od.height);
bd = db->get_block_blob(block_hash);
cryptonote::block b; cryptonote::block b;
if (!cryptonote::parse_and_validate_block_from_blob(bd, b)) if (!cryptonote::parse_and_validate_block_from_blob(bd, b))
{ {

3
src/blockchain_utilities/blockchain_depth.cpp
View File

@ -187,8 +187,7 @@ int main(int argc, char* argv[])
} }
else else
{ {
const crypto::hash block_hash = db->get_block_hash_from_height(opt_height); const cryptonote::blobdata bd = db->get_block_blob_from_height(opt_height);
const cryptonote::blobdata bd = db->get_block_blob(block_hash);
cryptonote::block b; cryptonote::block b;
if (!cryptonote::parse_and_validate_block_from_blob(bd, b)) if (!cryptonote::parse_and_validate_block_from_blob(bd, b))
{ {