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

Collator protocol subsystem #1659

Merged
montekki merged 20 commits into from
Sep 10, 2020
Merged

Collator protocol subsystem #1659

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a12b1ee
WIP
montekki Aug 20, 2020
b97ab57
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Aug 21, 2020
b6c5c2c
The initial implementation of the collator side.
montekki Aug 30, 2020
a2255d6
Improve comments
montekki Aug 31, 2020
2e9d3c4
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Aug 31, 2020
26ff153
Multiple collation requests
montekki Sep 3, 2020
00456c0
Add more tests and comments to validator side
montekki Sep 3, 2020
d463407
Add comments, remove dead code
montekki Sep 3, 2020
eda8d7e
Apply suggestions from code review
montekki Sep 7, 2020
0b6c572
Fix build after suggested changes
montekki Sep 8, 2020
b58d785
Also connect to the next validator group
montekki Sep 8, 2020
232db34
Remove a Future impl and move TimeoutExt to util
montekki Sep 8, 2020
bbd1c6a
Minor nits
montekki Sep 8, 2020
3ebad8a
Fix build
montekki Sep 8, 2020
a43e7a0
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Sep 8, 2020
36745f6
Change FetchCollations back to FetchCollation
montekki Sep 9, 2020
bad21c9
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Sep 9, 2020
b1c5c66
Try this
montekki Sep 9, 2020
0c48ed6
Final fixes
montekki Sep 10, 2020
3be73a1
Fix build
montekki Sep 10, 2020
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
The initial implementation of the collator side.
  • Loading branch information
@montekki
montekki committed Aug 30, 2020
commit b6c5c2ccacc8bbd16659debeed0d8ce03919a370
3 changes: 3 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions node/network/availability-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ polkadot-erasure-coding = { path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-network-bridge = { path = "../../network/bridge" }
polkadot-node-network-protocol = { path = "../../network/protocol" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
derive_more = "0.99.9"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
Expand Down
2 changes: 2 additions & 0 deletions node/network/collator-protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ codec = { package="parity-scale-codec", version = "1.3.4", features = ["std"] }
polkadot-primitives = { path = "../../../primitives" }
polkadot-network-bridge = { path = "../../network/bridge" }
polkadot-node-network-protocol = { path = "../../network/protocol" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
futures-timer = "3.0.2"

Expand All @@ -24,5 +25,6 @@ smol-timeout = "0.1.0"
smallvec = "1.4.2"

sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }

polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
Loading