From 3cf18f11ac30daeb203876f75477ed010f020f46 Mon Sep 17 00:00:00 2001
From: Marcin S <marcin@bytedude.com>
Date: Tue, 10 Jan 2023 12:59:12 -0500
Subject: [PATCH] Minor fixes (#6533)
* Minor fixes
* Fix compile errors
---
polkadot/node/core/pvf/src/execute/worker.rs | 5 +----
polkadot/node/network/dispute-distribution/src/lib.rs | 2 +-
polkadot/node/subsystem-util/src/nesting_sender.rs | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/polkadot/node/core/pvf/src/execute/worker.rs b/polkadot/node/core/pvf/src/execute/worker.rs
index df928efaa64..4b19d4029be 100644
--- a/polkadot/node/core/pvf/src/execute/worker.rs
+++ b/polkadot/node/core/pvf/src/execute/worker.rs
@@ -142,11 +142,8 @@ pub async fn start_work(
target: LOG_TARGET,
worker_pid = %pid,
validation_code_hash = ?artifact.id.code_hash,
- "execution worker exceeded allotted time for execution",
+ "execution worker exceeded lenient timeout for execution, child worker likely stalled",
);
- // TODO: This case is not really a hard timeout as the timeout here in the host is
- // lenient. Should fix this as part of
- // https://github.com/paritytech/polkadot/issues/3754.
Response::TimedOut
},
};
diff --git a/polkadot/node/network/dispute-distribution/src/lib.rs b/polkadot/node/network/dispute-distribution/src/lib.rs
index babdb303bbd..f3325a11a65 100644
--- a/polkadot/node/network/dispute-distribution/src/lib.rs
+++ b/polkadot/node/network/dispute-distribution/src/lib.rs
@@ -156,7 +156,7 @@ impl<AD> DisputeDistributionSubsystem<AD>
where
AD: AuthorityDiscovery + Clone,
{
- /// Create a new instance of the availability distribution.
+ /// Create a new instance of the dispute distribution.
pub fn new(
keystore: SyncCryptoStorePtr,
req_receiver: IncomingRequestReceiver<v1::DisputeRequest>,
diff --git a/polkadot/node/subsystem-util/src/nesting_sender.rs b/polkadot/node/subsystem-util/src/nesting_sender.rs
index 34ff7d84cbf..75f8da9a0cd 100644
--- a/polkadot/node/subsystem-util/src/nesting_sender.rs
+++ b/polkadot/node/subsystem-util/src/nesting_sender.rs
@@ -196,10 +196,10 @@ where
// Helper traits and implementations:
-impl<M, M1> Clone for NestingSender<M, M1>
+impl<M, Mnested> Clone for NestingSender<M, Mnested>
where
M: 'static,
- M1: 'static,
+ Mnested: 'static,
{
fn clone(&self) -> Self {
Self { sender: self.sender.clone(), conversion: self.conversion.clone() }
--
GitLab