Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Update to latest Substrate master #472

Merged
gavofyork merged 4 commits into from
Oct 11, 2019
Merged

Update to latest Substrate master #472

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34a2245
Update to latest Substrate master
bkchr Oct 10, 2019
7cffc41
Merge remote-tracking branch 'origin/master' into bkchr-substrate-upd…
gavofyork Oct 11, 2019
bfc13a5
Fix
gavofyork Oct 11, 2019
dffaae4
Fix compilation
bkchr Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix
  • Loading branch information
@gavofyork
gavofyork committed Oct 11, 2019
commit bfc13a574dc52747c0f66677b08c97b252c091cc
2 changes: 1 addition & 1 deletion runtime/src/parachains.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use sr_primitives::weights::SimpleDispatchInfo;
use primitives::{
Hash, Balance,
parachain::{
self, Id as ParaId, Chain, DutyRoster, AttestedCandidate, Statement, AccountIdConversion,
self, Id as ParaId, Chain, DutyRoster, AttestedCandidate, Statement,
ParachainDispatchOrigin, UpwardMessage, BlockIngressRoots, ValidatorId, ActiveParas, CollatorId,
Retriable
},
Expand Down