diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-04 14:44:05 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-04 14:44:05 -0500 |
| commit | 59ba0eee69d93bcf56b9c119b8f70c799734617f (patch) | |
| tree | ed9c61f29caeb1abe7e8e3d3c8acbf7b63046ee8 /src | |
| parent | 591c72613bc3da5aa48cab9281c38c08fc003498 (diff) | |
| parent | 3c071d203f3118b74861b734da02d75ba258d17e (diff) | |
| download | monzero-core-59ba0eee69d93bcf56b9c119b8f70c799734617f.tar.gz monzero-core-59ba0eee69d93bcf56b9c119b8f70c799734617f.tar.xz monzero-core-59ba0eee69d93bcf56b9c119b8f70c799734617f.zip | |
Merge pull request #5650
3c071d2 blockchain: silence an error getting blocks for pruned nodes (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 23534f0d3..2fdf169a1 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1893,10 +1893,14 @@ bool Blockchain::handle_get_objects(NOTIFY_REQUEST_GET_OBJECTS::request& arg, NO if (missed_tx_ids.size() != 0) { - LOG_ERROR("Error retrieving blocks, missed " << missed_tx_ids.size() - << " transactions for block with hash: " << get_block_hash(bl.second) - << std::endl - ); + // do not display an error if the peer asked for an unpruned block which we are not meant to have + if (tools::has_unpruned_block(get_block_height(bl.second), get_current_blockchain_height(), get_blockchain_pruning_seed())) + { + LOG_ERROR("Error retrieving blocks, missed " << missed_tx_ids.size() + << " transactions for block with hash: " << get_block_hash(bl.second) + << std::endl + ); + } // append missed transaction hashes to response missed_ids field, // as done below if any standalone transactions were requested |