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

updating v0.3 to use substrate v0.10 #146

Merged
rphmeier merged 19 commits into from
Feb 25, 2019
Merged

updating v0.3 to use substrate v0.10 #146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3798772
updating to latest substrate v0.10
gterzian Feb 20, 2019
ca15ae0
better handling of outer poll
gterzian Feb 21, 2019
77084e0
nit
gterzian Feb 21, 2019
b602d34
fix tests
gterzian Feb 21, 2019
f2a505e
remove comment
gterzian Feb 25, 2019
58d0859
reduce indentation
gterzian Feb 25, 2019
e213c80
use self.poll
gterzian Feb 25, 2019
aebe865
bring oneshot into scope
gterzian Feb 25, 2019
db0f7d4
spaces
gterzian Feb 25, 2019
34b2fc7
wrap
gterzian Feb 25, 2019
5999e70
remove match
gterzian Feb 25, 2019
41f733a
wrap
gterzian Feb 25, 2019
ed7e75d
Update primitives/Cargo.toml
gnunicorn Feb 25, 2019
5453bf4
Update runtime/wasm/Cargo.toml
gnunicorn Feb 25, 2019
ba41dad
Update runtime/wasm/Cargo.toml
gnunicorn Feb 25, 2019
5339ef8
Update test-parachains/adder/collator/src/main.rs
gnunicorn Feb 25, 2019
0d9508b
indent
gterzian Feb 25, 2019
6277543
Merge branch 'v0.3' of github.com:gterzian/polkadot into v0.3
gterzian Feb 25, 2019
f96e275
add paranthese
gterzian Feb 25, 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
bring oneshot into scope
  • Loading branch information
@gterzian
gterzian committed Feb 25, 2019
commit aebe8652251c5e8ded917255097fda4320f9570d
7 changes: 4 additions & 3 deletions network/src/consensus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use codec::Decode;

use futures::prelude::*;
use futures::sync::mpsc;
use futures::sync::oneshot;

use std::collections::HashMap;
use std::sync::Arc;
Expand Down Expand Up @@ -187,8 +188,8 @@ pub struct NetworkDown;

/// A future that resolves when a collation is received.
pub struct AwaitingCollation {
outer: ::futures::sync::oneshot::Receiver<::futures::sync::oneshot::Receiver<Collation>>,
inner: Option<::futures::sync::oneshot::Receiver<Collation>>
outer: oneshot::Receiver<::futures::sync::oneshot::Receiver<Collation>>,
inner: Option<oneshot::Receiver<Collation>>
}

impl Future for AwaitingCollation {
Expand Down Expand Up @@ -219,7 +220,7 @@ impl<P: ProvideRuntimeApi + Send + Sync + 'static, E: Clone> Collators for Conse
type Collation = AwaitingCollation;

fn collate(&self, parachain: ParaId, relay_parent: Hash) -> Self::Collation {
let (tx, rx) = ::futures::sync::oneshot::channel();
let (tx, rx) = oneshot::channel();
self.network.with_spec(move |spec, _| {
let collation = spec.await_collation(relay_parent, parachain);
let _ = tx.send(collation);
Expand Down
7 changes: 4 additions & 3 deletions network/src/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use polkadot_primitives::parachain::{BlockData, Extrinsic, CandidateReceipt, Par

use codec::Encode;
use futures::prelude::*;
use futures::sync::oneshot;
use tokio::runtime::TaskExecutor;
use parking_lot::Mutex;

Expand Down Expand Up @@ -228,7 +229,7 @@ impl<P: ProvideRuntimeApi + Send> TableRouter for Router<P>
fn fetch_block_data(&self, candidate: &CandidateReceipt) -> BlockDataReceiver {
let parent_hash = self.parent_hash.clone();
let candidate = candidate.clone();
let (tx, rx) = ::futures::sync::oneshot::channel();
let (tx, rx) = oneshot::channel();
self.network.with_spec(move |spec, ctx| {
let inner_rx = spec.fetch_block_data(ctx, &candidate, parent_hash);
let _ = tx.send(inner_rx);
Expand All @@ -250,8 +251,8 @@ impl<P> Drop for Router<P> {

/// Receiver for block data.
pub struct BlockDataReceiver {
outer: ::futures::sync::oneshot::Receiver<::futures::sync::oneshot::Receiver<BlockData>>,
inner: Option<::futures::sync::oneshot::Receiver<BlockData>>
outer: oneshot::Receiver<oneshot::Receiver<BlockData>>,
inner: Option<oneshot::Receiver<BlockData>>
}

impl Future for BlockDataReceiver {
Expand Down