From 2645659ab2a0de03248f39b59a8765af8155cdb0 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Fri, 19 Jun 2020 15:56:09 +0200
Subject: [PATCH] More descriptive error message when invalid slot duration is
used (#6430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Initial commit
Forked at: 252416d3858e0271d3d23af4a2f8e218307a978e
No parent branch.
* Errors if slot_duration is zero
* Errors if slot_duration is zero
* Revert "Errors if slot_duration is zero"
This reverts commit a9e9820e124571f73d3e498e969a74d01fd3fe96.
* Update client/consensus/slots/src/lib.rs
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
substrate/client/consensus/slots/src/lib.rs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/substrate/client/consensus/slots/src/lib.rs b/substrate/client/consensus/slots/src/lib.rs
index fe1c6bab7b5..950f83fbced 100644
--- a/substrate/client/consensus/slots/src/lib.rs
+++ b/substrate/client/consensus/slots/src/lib.rs
@@ -455,7 +455,7 @@ impl<T: Clone> SlotDuration<T> {
CB: FnOnce(ApiRef<C::Api>, &BlockId<B>) -> sp_blockchain::Result<T>,
T: SlotData + Encode + Decode + Debug,
{
- match client.get_aux(T::SLOT_KEY)? {
+ let slot_duration = match client.get_aux(T::SLOT_KEY)? {
Some(v) => <T as codec::Decode>::decode(&mut &v[..])
.map(SlotDuration)
.map_err(|_| {
@@ -479,7 +479,15 @@ impl<T: Clone> SlotDuration<T> {
Ok(SlotDuration(genesis_slot_duration))
}
+ }?;
+
+ if slot_duration.slot_duration() == 0 {
+ return Err(sp_blockchain::Error::Msg(
+ "Invalid value for slot_duration: the value must be greater than 0.".into(),
+ ))
}
+
+ Ok(slot_duration)
}
/// Returns slot data value.
--
GitLab