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

Propagate Substrate#4284 to Polkadot #680

Closed
tomaka wants to merge 5 commits into from
Closed

Propagate Substrate#4284 to Polkadot #680

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 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
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
2 changes: 2 additions & 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,8 @@ 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" }
# TODO: change git repo before merging
sc-network-gossip = { git = "https://github.com/tomaka/polkadot", branch = "extract-gossip" }
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