Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Change assert to elog #334

Browse source
This commit is contained in:
theoreticalbts 2015-09-21 10:44:47 -04:00
parent 44f5bac305
commit a2b6f1a741
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/net/node.cpp
View file

@ -2495,11 +2495,23 @@ namespace graphene { namespace net { namespace detail {
originating_peer->last_block_delegate_has_seen = item_hashes_received.front(); originating_peer->last_block_delegate_has_seen = item_hashes_received.front();
originating_peer->last_block_number_delegate_has_seen = _delegate->get_block_number(item_hashes_received.front()); originating_peer->last_block_number_delegate_has_seen = _delegate->get_block_number(item_hashes_received.front());
originating_peer->last_block_time_delegate_has_seen = _delegate->get_block_time(item_hashes_received.front()); originating_peer->last_block_time_delegate_has_seen = _delegate->get_block_time(item_hashes_received.front());
dlog("popping item because delegate has already seen it. peer ${peer}'s last block the delegate has seen is now ${block_id} (actual block #${actual_block_num}, tracked block #${tracked_block_num})", if( !(originating_peer->last_block_number_delegate_has_seen == _delegate->get_block_number(originating_peer->last_block_delegate_has_seen)) )
("peer", originating_peer->get_remote_endpoint()) {
("block_id", originating_peer->last_block_delegate_has_seen) elog("popping item because delegate has already seen it. peer ${peer}'s last block the delegate has seen is now ${block_id} (actual block #${actual_block_num}, tracked block #${tracked_block_num})",
("actual_block_num", _delegate->get_block_number(item_hashes_received.front())) ("peer", originating_peer->get_remote_endpoint())
("tracked_block_num", originating_peer->last_block_number_delegate_has_seen)); ("block_id", originating_peer->last_block_delegate_has_seen)
("actual_block_num", _delegate->get_block_number(item_hashes_received.front()))
("tracked_block_num", originating_peer->last_block_number_delegate_has_seen));
}
else
{
dlog("popping item because delegate has already seen it. peer ${peer}'s last block the delegate has seen is now ${block_id} (actual block #${actual_block_num}, tracked block #${tracked_block_num})",
("peer", originating_peer->get_remote_endpoint())
("block_id", originating_peer->last_block_delegate_has_seen)
("actual_block_num", _delegate->get_block_number(item_hashes_received.front()))
("tracked_block_num", originating_peer->last_block_number_delegate_has_seen));
}
item_hashes_received.pop_front(); item_hashes_received.pop_front();
} }
dlog("after removing all items we have already seen, item_hashes_received.size() = ${size}", ("size", item_hashes_received.size())); dlog("after removing all items we have already seen, item_hashes_received.size() = ${size}", ("size", item_hashes_received.size()));