external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

bugfix in collator

Browse source
This commit is contained in:
ton 2020-04-02 22:13:18 +04:00
parent 0e4277313c
commit 54b40df4aa
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
validator/impl/collator.cpp
View file

@ -1628,14 +1628,15 @@ bool Collator::do_collate() {
if (max_lt == start_lt) { if (max_lt == start_lt) {
++max_lt; ++max_lt;
} }
// 1.1. delete delivered messages from output queue // NB: interchanged 1.2 and 1.1 (is this always correct?)
if (!out_msg_queue_cleanup()) { // 1.1. re-adjust neighbors' out_msg_queues (for oneself)
return fatal_error("cannot scan OutMsgQueue and remove already delivered messages");
}
// 1.2. re-adjust neighbors' out_msg_queues (for oneself)
if (!add_trivial_neighbor()) { if (!add_trivial_neighbor()) {
return fatal_error("cannot add previous block as a trivial neighbor"); return fatal_error("cannot add previous block as a trivial neighbor");
} }
// 1.2. delete delivered messages from output queue
if (!out_msg_queue_cleanup()) {
return fatal_error("cannot scan OutMsgQueue and remove already delivered messages");
}
// 1.3. create OutputQueueMerger from adjusted neighbors // 1.3. create OutputQueueMerger from adjusted neighbors
CHECK(!nb_out_msgs_); CHECK(!nb_out_msgs_);
LOG(DEBUG) << "creating OutputQueueMerger"; LOG(DEBUG) << "creating OutputQueueMerger";