From d324fa58208e69179b473ccb1cc2a8fc1c5e6ce0 Mon Sep 17 00:00:00 2001 From: SpyCheese Date: Fri, 13 Jan 2023 19:04:11 +0300 Subject: [PATCH] Bugfix --- overlay/overlay-peers.cpp | 4 +++- validator/impl/out-msg-queue-proof.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/overlay/overlay-peers.cpp b/overlay/overlay-peers.cpp index 409f0993..28dac8f0 100644 --- a/overlay/overlay-peers.cpp +++ b/overlay/overlay-peers.cpp @@ -24,7 +24,9 @@ namespace overlay { void OverlayImpl::del_peer(adnl::AdnlNodeIdShort id) { auto P = peers_.get(id); - CHECK(P != nullptr); + if (P == nullptr) { + return; + } VLOG(OVERLAY_DEBUG) << this << ": deleting peer " << id; diff --git a/validator/impl/out-msg-queue-proof.cpp b/validator/impl/out-msg-queue-proof.cpp index 4ba102c5..7591ab17 100644 --- a/validator/impl/out-msg-queue-proof.cpp +++ b/validator/impl/out-msg-queue-proof.cpp @@ -177,7 +177,7 @@ void WaitOutMsgQueueProof::run_local() { [SelfId = actor_id(this)](td::Result> R) { if (R.is_error()) { td::actor::send_closure(SelfId, &WaitOutMsgQueueProof::abort_query, - R.move_as_error_prefix("failed to get shard state")); + R.move_as_error_prefix("failed to get shard state: ")); } else { td::actor::send_closure(SelfId, &WaitOutMsgQueueProof::got_state_root, R.move_as_ok()->root_cell()); @@ -189,7 +189,7 @@ void WaitOutMsgQueueProof::run_local() { [SelfId = actor_id(this)](td::Result> R) { if (R.is_error()) { td::actor::send_closure(SelfId, &WaitOutMsgQueueProof::abort_query, - R.move_as_error_prefix("failed to get block data")); + R.move_as_error_prefix("failed to get block data: ")); } else { td::actor::send_closure(SelfId, &WaitOutMsgQueueProof::got_block_root, R.move_as_ok()->root_cell()); @@ -247,7 +247,7 @@ void WaitOutMsgQueueProof::run_net() { void BuildOutMsgQueueProof::abort_query(td::Status reason) { if (promise_) { - LOG(WARNING) << "failed to build msg queue proof for " << block_id_.to_str() << ": " << reason; + LOG(DEBUG) << "failed to build msg queue proof for " << block_id_.to_str() << ": " << reason; promise_.set_error( reason.move_as_error_prefix(PSTRING() << "failed to build msg queue proof for " << block_id_.to_str() << ": ")); } @@ -260,7 +260,7 @@ void BuildOutMsgQueueProof::start_up() { [SelfId = actor_id(this)](td::Result> R) { if (R.is_error()) { td::actor::send_closure(SelfId, &BuildOutMsgQueueProof::abort_query, - R.move_as_error_prefix("failed to get shard state")); + R.move_as_error_prefix("failed to get shard state: ")); } else { td::actor::send_closure(SelfId, &BuildOutMsgQueueProof::got_state_root, R.move_as_ok()->root_cell()); @@ -272,7 +272,7 @@ void BuildOutMsgQueueProof::start_up() { [SelfId = actor_id(this)](td::Result> R) { if (R.is_error()) { td::actor::send_closure(SelfId, &BuildOutMsgQueueProof::abort_query, - R.move_as_error_prefix("failed to get block data")); + R.move_as_error_prefix("failed to get block data: ")); } else { td::actor::send_closure(SelfId, &BuildOutMsgQueueProof::got_block_root, R.move_as_ok()->root_cell());