Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
polkadot-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
parity
Mirrored projects
polkadot-sdk
Commits
006bec18
Commit
006bec18
authored
5 years ago
by
Bastian Köcher
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation
parent
249eb4db
Branches
Branches containing commit
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cumulus/Cargo.lock
+322
-296
322 additions, 296 deletions
cumulus/Cargo.lock
cumulus/collator/src/lib.rs
+7
-4
7 additions, 4 deletions
cumulus/collator/src/lib.rs
with
329 additions
and
300 deletions
cumulus/Cargo.lock
+
322
−
296
View file @
006bec18
This diff is collapsed.
Click to expand it.
cumulus/collator/src/lib.rs
+
7
−
4
View file @
006bec18
...
...
@@ -20,7 +20,9 @@ use runtime_primitives::traits::Block as BlockT;
use
consensus_common
::{
Environment
,
Proposer
};
use
polkadot_collator
::{
InvalidHead
,
ParachainContext
};
use
polkadot_primitives
::
parachain
::{
self
,
BlockData
,
Message
,
Id
as
ParaId
,
Extrinsic
};
use
polkadot_primitives
::{
Hash
,
parachain
::{
self
,
BlockData
,
Message
,
Id
as
ParaId
,
Extrinsic
,
Status
as
ParachainStatus
}
};
use
codec
::{
Decode
,
Encode
};
use
log
::
error
;
...
...
@@ -45,7 +47,7 @@ impl<Block: BlockT, PF: Environment<Block>> Collator<Block, PF> {
/// Create a new instance.
fn
new
(
proposer_factory
:
Arc
<
PF
>
,
inherent_data_providers
:
inherent
_data
::
InherentDataProviders
inherent_data_providers
:
inherent
s
::
InherentDataProviders
)
->
Self
{
Self
{
proposer_factory
,
...
...
@@ -77,13 +79,14 @@ where
fn
produce_candidate
<
I
:
IntoIterator
<
Item
=
(
ParaId
,
Message
)
>>
(
&
self
,
last_head
:
parachain
::
HeadData
,
_relay_chain_parent
:
Hash
,
status
:
ParachainStatus
,
_
:
I
,
)
->
Self
::
ProduceCandidate
{
let
factory
=
self
.proposer_factory
.clone
();
let
inherent_providers
=
self
.inherent_data_providers
.clone
();
let
res
=
HeadData
::
<
Block
>
::
decode
(
&
mut
&
last_head
.0
[
..
])
let
res
=
HeadData
::
<
Block
>
::
decode
(
&
mut
&
status
.head_data
.0
[
..
])
.ok_or_else
(||
InvalidHead
)
.into_future
()
.and_then
(
move
|
last_head
|
factory
.init
(
&
last_head
.header
)
.map_err
(|
e
|
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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