Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Duniter v2S
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
rust
Duniter v2S
Commits
83f279f0
Commit
83f279f0
authored
5 months ago
by
Hugo Trentesaux
Browse files
Options
Downloads
Plain Diff
Merge branch 'hugo/tmp-0.9.1' into network/gdev-800
parents
f3f99ab1
79e46685
No related branches found
Branches containing commit
Tags
gdev-900-0.9.1
Tags containing commit
No related merge requests found
Pipeline
#39038
waiting for manual action
Stage: build
Stage: release
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Cargo.lock
+1
-1
1 addition, 1 deletion
Cargo.lock
node/Cargo.toml
+1
-1
1 addition, 1 deletion
node/Cargo.toml
node/src/service.rs
+12
-1
12 additions, 1 deletion
node/src/service.rs
with
14 additions
and
3 deletions
Cargo.lock
+
1
−
1
View file @
83f279f0
...
@@ -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",
...
...
This diff is collapsed.
Click to expand it.
node/Cargo.toml
+
1
−
1
View file @
83f279f0
...
@@ -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]
...
...
This diff is collapsed.
Click to expand it.
node/src/service.rs
+
12
−
1
View file @
83f279f0
...
@@ -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
))
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment