diff --git a/node/core/backing/src/lib.rs b/node/core/backing/src/lib.rs index 5ed80017e7d9..338f333efbfa 100644 --- a/node/core/backing/src/lib.rs +++ b/node/core/backing/src/lib.rs @@ -92,7 +92,7 @@ pub enum Error { #[error(transparent)] ValidationFailed(#[from] ValidationFailed), #[error(transparent)] - Mpsc(#[from] mpsc::SendError), + BackgroundValidationMpsc(#[from] mpsc::SendError), #[error(transparent)] UtilError(#[from] util::Error), } @@ -444,7 +444,7 @@ async fn validate_and_make_available( tx_command .send(ValidatedCandidateCommand::AttestNoPoV(candidate.hash())) .await - .map_err(Error::Mpsc)?; + .map_err(Error::BackgroundValidationMpsc)?; return Ok(()) }, Err(err) => return Err(err), @@ -650,11 +650,19 @@ impl CandidateBackingJob { // spawn background task. let bg = async move { if let Err(e) = validate_and_make_available(params).await { - tracing::error!( - target: LOG_TARGET, - "Failed to validate and make available: {:?}", - e - ); + if let Error::BackgroundValidationMpsc(error) = e { + tracing::debug!( + target: LOG_TARGET, + ?error, + "Mpsc background validation mpsc died during validation- leaf no longer active?" + ); + } else { + tracing::error!( + target: LOG_TARGET, + "Failed to validate and make available: {:?}", + e + ); + } } }; sender diff --git a/runtime/kusama/src/weights/pallet_vesting.rs b/runtime/kusama/src/weights/pallet_vesting.rs index 8f5ee20edc3d..b363e63287e5 100644 --- a/runtime/kusama/src/weights/pallet_vesting.rs +++ b/runtime/kusama/src/weights/pallet_vesting.rs @@ -42,24 +42,23 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_vesting`. pub struct WeightInfo(PhantomData); impl pallet_vesting::WeightInfo for WeightInfo { - fn vest_locked(l: u32, s: u32, ) -> Weight { + fn vest_locked(l: u32, s: u32) -> Weight { (93_789_000 as Weight) // Standard Error: 70_000 .saturating_add((41_000 as Weight).saturating_mul(l as Weight)) // Standard Error: 182_000 .saturating_add((211_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_unlocked(_l: u32, s: u32, ) -> Weight { + fn vest_unlocked(_l: u32, s: u32) -> Weight { (90_737_000 as Weight) // Standard Error: 0 .saturating_add((263_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_other_locked(l: u32, s: u32, ) -> Weight { + fn vest_other_locked(l: u32, s: u32) -> Weight { (85_211_000 as Weight) // Standard Error: 17_000 .saturating_add((153_000 as Weight).saturating_mul(l as Weight)) @@ -68,7 +67,7 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vest_other_unlocked(l: u32, s: u32, ) -> Weight { + fn vest_other_unlocked(l: u32, s: u32) -> Weight { (90_368_000 as Weight) // Standard Error: 17_000 .saturating_add((31_000 as Weight).saturating_mul(l as Weight)) @@ -77,21 +76,21 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vested_transfer(l: u32, _s: u32, ) -> Weight { + fn vested_transfer(l: u32, _s: u32) -> Weight { (167_500_000 as Weight) // Standard Error: 194_000 .saturating_add((255_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn force_vested_transfer(l: u32, _s: u32, ) -> Weight { + fn force_vested_transfer(l: u32, _s: u32) -> Weight { (174_000_000 as Weight) // Standard Error: 70_000 .saturating_add((143_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight { (101_778_000 as Weight) // Standard Error: 17_000 .saturating_add((194_000 as Weight).saturating_mul(l as Weight)) @@ -100,7 +99,7 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn unlocking_merge_schedules(l: u32, s: u32) -> Weight { (104_111_000 as Weight) // Standard Error: 88_000 .saturating_add((276_000 as Weight).saturating_mul(l as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_vesting.rs b/runtime/polkadot/src/weights/pallet_vesting.rs index 67e71acb239c..11b867f9882b 100644 --- a/runtime/polkadot/src/weights/pallet_vesting.rs +++ b/runtime/polkadot/src/weights/pallet_vesting.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_vesting`. pub struct WeightInfo(PhantomData); impl pallet_vesting::WeightInfo for WeightInfo { - fn vest_locked(l: u32, s: u32, ) -> Weight { + fn vest_locked(l: u32, s: u32) -> Weight { (93_789_000 as Weight) // Standard Error: 70_000 .saturating_add((41_000 as Weight).saturating_mul(l as Weight)) @@ -51,14 +51,14 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_unlocked(_l: u32, s: u32, ) -> Weight { + fn vest_unlocked(_l: u32, s: u32) -> Weight { (90_737_000 as Weight) // Standard Error: 0 .saturating_add((263_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_other_locked(l: u32, s: u32, ) -> Weight { + fn vest_other_locked(l: u32, s: u32) -> Weight { (85_211_000 as Weight) // Standard Error: 17_000 .saturating_add((153_000 as Weight).saturating_mul(l as Weight)) @@ -67,7 +67,7 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vest_other_unlocked(l: u32, s: u32, ) -> Weight { + fn vest_other_unlocked(l: u32, s: u32) -> Weight { (90_368_000 as Weight) // Standard Error: 17_000 .saturating_add((31_000 as Weight).saturating_mul(l as Weight)) @@ -76,21 +76,21 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vested_transfer(l: u32, _s: u32, ) -> Weight { + fn vested_transfer(l: u32, _s: u32) -> Weight { (167_500_000 as Weight) // Standard Error: 194_000 .saturating_add((255_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn force_vested_transfer(l: u32, _s: u32, ) -> Weight { + fn force_vested_transfer(l: u32, _s: u32) -> Weight { (174_000_000 as Weight) // Standard Error: 70_000 .saturating_add((143_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight { (101_778_000 as Weight) // Standard Error: 17_000 .saturating_add((194_000 as Weight).saturating_mul(l as Weight)) @@ -99,7 +99,7 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn unlocking_merge_schedules(l: u32, s: u32) -> Weight { (104_111_000 as Weight) // Standard Error: 88_000 .saturating_add((276_000 as Weight).saturating_mul(l as Weight)) @@ -109,4 +109,3 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(3 as Weight)) } } - diff --git a/runtime/westend/src/weights/pallet_vesting.rs b/runtime/westend/src/weights/pallet_vesting.rs index c2a2df68398a..2afee0545187 100644 --- a/runtime/westend/src/weights/pallet_vesting.rs +++ b/runtime/westend/src/weights/pallet_vesting.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_vesting`. pub struct WeightInfo(PhantomData); impl pallet_vesting::WeightInfo for WeightInfo { - fn vest_locked(l: u32, s: u32, ) -> Weight { + fn vest_locked(l: u32, s: u32) -> Weight { (93_789_000 as Weight) // Standard Error: 70_000 .saturating_add((41_000 as Weight).saturating_mul(l as Weight)) @@ -51,14 +51,14 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_unlocked(_l: u32, s: u32, ) -> Weight { + fn vest_unlocked(_l: u32, s: u32) -> Weight { (90_737_000 as Weight) // Standard Error: 0 .saturating_add((263_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_other_locked(l: u32, s: u32, ) -> Weight { + fn vest_other_locked(l: u32, s: u32) -> Weight { (85_211_000 as Weight) // Standard Error: 17_000 .saturating_add((153_000 as Weight).saturating_mul(l as Weight)) @@ -67,7 +67,7 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vest_other_unlocked(l: u32, s: u32, ) -> Weight { + fn vest_other_unlocked(l: u32, s: u32) -> Weight { (90_368_000 as Weight) // Standard Error: 17_000 .saturating_add((31_000 as Weight).saturating_mul(l as Weight)) @@ -76,21 +76,21 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vested_transfer(l: u32, _s: u32, ) -> Weight { + fn vested_transfer(l: u32, _s: u32) -> Weight { (167_500_000 as Weight) // Standard Error: 194_000 .saturating_add((255_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn force_vested_transfer(l: u32, _s: u32, ) -> Weight { + fn force_vested_transfer(l: u32, _s: u32) -> Weight { (174_000_000 as Weight) // Standard Error: 70_000 .saturating_add((143_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight { (101_778_000 as Weight) // Standard Error: 17_000 .saturating_add((194_000 as Weight).saturating_mul(l as Weight)) @@ -99,7 +99,7 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn unlocking_merge_schedules(l: u32, s: u32) -> Weight { (104_111_000 as Weight) // Standard Error: 88_000 .saturating_add((276_000 as Weight).saturating_mul(l as Weight)) @@ -108,4 +108,4 @@ impl pallet_vesting::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } -} \ No newline at end of file +}