Skip to content

Commit

Permalink
v0.3.2 (paritytech#98)
Browse files Browse the repository at this point in the history
* bump substrate version

* fix polkadot-collator
  • Loading branch information
rphmeier authored Jan 21, 2019
1 parent b328153 commit b28ff9e
Show file tree
Hide file tree
Showing 9 changed files with 419 additions and 159 deletions.
445 changes: 353 additions & 92 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub fn run<I, T, W>(args: I, worker: W, version: cli::VersionInfo) -> error::Res

let (spec, mut config) = cli::parse_matches::<service::Factory, _>(load_spec, &version, "parity-polkadot", &matches)?;

match cli::execute_default::<service::Factory, _,>(spec, worker, &matches, &config, &version)? {
match cli::execute_default::<service::Factory, _>(spec, worker, &matches, &config)? {
cli::Action::ExecutedInternally => (),
cli::Action::RunService(worker) => {
info!("Parity ·:· Polkadot");
Expand Down
2 changes: 1 addition & 1 deletion collator/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ impl<P, E> Worker for CollationNode<P, E> where

let work = future::lazy(move || {
let api = client.runtime_api();
let last_head = match try_fr!(api.parachain_head(&id, &para_id)) {
let last_head = match try_fr!(api.parachain_head(&id, para_id)) {
Some(last_head) => last_head,
None => return future::Either::A(future::ok(())),
};
Expand Down
4 changes: 2 additions & 2 deletions consensus/src/collation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ pub fn validate_collation<P>(

let api = client.runtime_api();
let para_id = collation.receipt.parachain_index;
let validation_code = api.parachain_code(relay_parent, &para_id)?
let validation_code = api.parachain_code(relay_parent, para_id)?
.ok_or_else(|| ErrorKind::InactiveParachain(para_id))?;

let chain_head = api.parachain_head(relay_parent, &para_id)?
let chain_head = api.parachain_head(relay_parent, para_id)?
.ok_or_else(|| ErrorKind::InactiveParachain(para_id))?;

let params = ValidationParams {
Expand Down
2 changes: 1 addition & 1 deletion consensus/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ impl<C, TxApi> CreateProposal<C, TxApi> where
let mut block_builder = BlockBuilder::at_block(&self.parent_id, &*self.client)?;

{
let inherents = runtime_api.inherent_extrinsics(&self.parent_id, &inherent_data)?;
let inherents = runtime_api.inherent_extrinsics(&self.parent_id, inherent_data)?;
for inherent in inherents {
block_builder.push(inherent)?;
}
Expand Down
6 changes: 3 additions & 3 deletions runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ impl_runtime_apis! {
Executive::execute_block(block)
}

fn initialise_block(header: <Block as BlockT>::Header) {
Executive::initialise_block(&header)
fn initialise_block(header: &<Block as BlockT>::Header) {
Executive::initialise_block(header)
}
}

Expand Down Expand Up @@ -387,7 +387,7 @@ impl_runtime_apis! {
}

impl fg_primitives::GrandpaApi<Block> for Runtime {
fn grandpa_pending_change(digest: DigestFor<Block>)
fn grandpa_pending_change(digest: &DigestFor<Block>)
-> Option<ScheduledChange<BlockNumber>>
{
for log in digest.logs.iter().filter_map(|l| match l {
Expand Down
117 changes: 58 additions & 59 deletions runtime/wasm/Cargo.lock

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

0 comments on commit b28ff9e

Please sign in to comment.