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

Supercede 'Propagate Substrate#4284 to Polkadot' #695

Merged
bkchr merged 13 commits into from
Dec 17, 2019
Merged

Supercede 'Propagate Substrate#4284 to Polkadot' #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8028ef3
Propagate Substrate#4284 to Polkadot
tomaka Dec 9, 2019
e18795e
Fix tests
tomaka Dec 10, 2019
c092750
Merge remote-tracking branch 'upstream/master' into wip-4284
tomaka Dec 10, 2019
ccbf45d
Merge remote-tracking branch 'upstream/master' into wip-4284
tomaka Dec 12, 2019
5e9579b
Fixes
tomaka Dec 12, 2019
52ff3a4
Merge remote-tracking branch 'parity/master' into HEAD
expenses Dec 13, 2019
e50247d
Use hash part of fund id as child unique id.
cheme Dec 2, 2019
8c7a548
Add comma
expenses Dec 16, 2019
a9e6f20
Switch branch
expenses Dec 16, 2019
58eb423
run cargo update
expenses Dec 17, 2019
ac6a1d0
Update polkadot-master only
expenses Dec 17, 2019
73f6d7b
Merge cheme's changes
expenses Dec 17, 2019
ed16a7c
Fix collator
expenses Dec 17, 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
231 changes: 132 additions & 99 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions collator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ use polkadot_cli::{
Worker, IntoExit, ProvideRuntimeApi, AbstractService, CustomConfiguration, ParachainHost,
};
use polkadot_network::validation::{LeafWorkParams, ValidationNetwork};
use polkadot_network::{PolkadotNetworkService, PolkadotProtocol};
use polkadot_network::PolkadotProtocol;
use polkadot_runtime::RuntimeApi;

pub use polkadot_cli::VersionInfo;
Expand All @@ -90,7 +90,7 @@ pub trait Network: Send + Sync {
fn checked_statements(&self, relay_parent: Hash) -> Box<dyn Stream<Item=SignedStatement>>;
}

impl<P, E, SP> Network for ValidationNetwork<P, E, PolkadotNetworkService, SP> where
impl<P, E, SP> Network for ValidationNetwork<P, E, SP> where
P: 'static + Send + Sync,
E: 'static + Send + Sync,
SP: 'static + Spawn + Clone + Send + Sync,
Expand Down Expand Up @@ -231,7 +231,7 @@ pub async fn collate<R, P>(

/// Polkadot-api context.
struct ApiContext<P, E, SP> {
network: Arc<ValidationNetwork<P, E, PolkadotNetworkService, SP>>,
network: Arc<ValidationNetwork<P, E, SP>>,
parent_hash: Hash,
validators: Vec<ValidatorId>,
}
Expand Down Expand Up @@ -347,12 +347,12 @@ impl<P, E> Worker for CollationNode<P, E> where
let message_validator = polkadot_network::gossip::register_validator(
network.clone(),
(is_known, client.clone()),
&spawner
);

let validation_network = Arc::new(ValidationNetwork::new(
network.clone(),
exit.clone(),
message_validator,
exit.clone(),
client.clone(),
spawner.clone(),
));
Expand Down
1 change: 1 addition & 0 deletions network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ polkadot-primitives = { path = "../primitives" }
polkadot-erasure-coding = { path = "../erasure-coding" }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
futures = "0.3.1"
Expand Down
Loading