Skip to content
Snippets Groups Projects
Commit 83f279f0 authored by Hugo Trentesaux's avatar Hugo Trentesaux
Browse files

Merge branch 'hugo/tmp-0.9.1' into network/gdev-800

parents f3f99ab1 79e46685
No related branches found
Tags gdev-900-0.9.1
No related merge requests found
Pipeline #39038 waiting for manual action
...@@ -3028,7 +3028,7 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" ...@@ -3028,7 +3028,7 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]] [[package]]
name = "duniter" name = "duniter"
version = "0.9.0" version = "0.9.1"
dependencies = [ dependencies = [
"async-io", "async-io",
"bs58 0.5.1", "bs58 0.5.1",
......
...@@ -7,7 +7,7 @@ homepage.workspace = true ...@@ -7,7 +7,7 @@ homepage.workspace = true
license.workspace = true license.workspace = true
name = "duniter" name = "duniter"
repository.workspace = true repository.workspace = true
version = "0.9.0" version = "0.9.1"
default-run = "duniter" default-run = "duniter"
[package.metadata.docs.rs] [package.metadata.docs.rs]
......
...@@ -504,6 +504,7 @@ where ...@@ -504,6 +504,7 @@ where
>( >(
&*client, parent, distance_dir, &babe_owner_keys.clone() &*client, parent, distance_dir, &babe_owner_keys.clone()
)?; )?;
// in case of manual sealing, the distance is forced to succeed
Ok((timestamp, babe, distance)) Ok((timestamp, babe, distance))
} }
}, },
...@@ -549,7 +550,17 @@ where ...@@ -549,7 +550,17 @@ where
FullBackend, FullBackend,
>( >(
&*client, parent, distance_dir, &babe_owner_keys.clone() &*client, parent, distance_dir, &babe_owner_keys.clone()
)?; );
// provides fallback when distance inherent data provider crashes
// (only when sealing is not manual)
let distance = match distance {
Ok(distance) => distance,
Err(e) => {
log::warn!("{:?}", e);
sp_distance::InherentDataProvider::new(None)
}
};
Ok((slot, timestamp, storage_proof, distance)) Ok((slot, timestamp, storage_proof, distance))
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment