Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
3e9abcf
stupid, but it compiles
Sep 5, 2020
e1fe858
redo
Sep 8, 2020
d09622b
cleanup
Sep 8, 2020
9e8cfe2
add ValidatorDiscovery to msgs
Sep 8, 2020
0bae9e4
sketch network bridge code
Sep 8, 2020
4fa0236
ConnectToAuthorities instead of validators
Sep 9, 2020
9f81f90
more stuff
Sep 10, 2020
d8d1302
cleanup
Sep 10, 2020
6c18572
more stuff
Sep 10, 2020
251427d
complete ConnectToAuthoritiesState
Sep 10, 2020
31d7329
Update node/network/bridge/src/lib.rs
Sep 10, 2020
f715c33
Collator protocol subsystem (#1659)
montekki Sep 10, 2020
b80e050
handle multiple in-flight connection requests
Sep 10, 2020
0e0525d
handle cancelled requests
Sep 10, 2020
64dcdb1
Merge branch 'master' into ao-validator-discovery-api
Sep 10, 2020
2cf1610
Update node/core/runtime-api/src/lib.rs
Sep 11, 2020
1bee32c
redo it again
Sep 11, 2020
c0d3a5a
more stuff
Sep 12, 2020
de19f1d
redo it again
Sep 14, 2020
eb1afd7
Merge branch 'ao-validator-discovery-api' of github.com:paritytech/po…
Sep 14, 2020
dbbfe23
Merge branch 'master' into ao-validator-discovery-api
Sep 14, 2020
e6a0a85
update comments
Sep 14, 2020
36cf3f4
workaround Future is not Send
Sep 14, 2020
9f20552
fix trailing spaces
Sep 14, 2020
ef4c6da
clarify comments
Sep 14, 2020
6305c41
bridge: fix compilation in tests
Sep 14, 2020
14fe353
update more comments
Sep 14, 2020
7ea8588
small fixes
Sep 14, 2020
f6a4068
port collator protocol to new validator discovery api
Sep 14, 2020
ac02180
collator tests compile
Sep 15, 2020
3dea047
collator tests pass
Sep 15, 2020
62e46a1
do not revoke a request when the stream receiver is closed
Sep 15, 2020
bbaf435
make revoking opt-in
Sep 15, 2020
8cfab6f
fix is_fulfilled
Sep 15, 2020
68fc8bb
handle request revokation in collator
Sep 16, 2020
a23edc0
tests
Sep 16, 2020
0a9c064
Merge branch 'master' into ao-validator-discovery-api
Sep 16, 2020
98d8346
wait for validator connections asyncronously
Sep 17, 2020
c03f766
Merge branch 'master' into ao-validator-discovery-api
Sep 17, 2020
e077b51
fix compilation
Sep 17, 2020
2132114
relabel my todos
Sep 17, 2020
eb3bacb
apply Fedor's patch
Sep 17, 2020
1112368
resolve reconnection TODO
Sep 18, 2020
6fbca68
Merge branch 'master' into ao-validator-discovery-api
Sep 18, 2020
3d2def9
resolve revoking TODO
Sep 18, 2020
dee8b27
resolve channel capacity TODO
Sep 18, 2020
c59d5a7
resolve peer cloning TODO
Sep 18, 2020
0580441
resolve peer disconnected TODO
Sep 18, 2020
db37a2f
resolve PeerSet TODO
Sep 18, 2020
a237119
wip tests
Sep 18, 2020
a8e3105
more tests
Sep 22, 2020
95f989e
resolve Arc TODO
Sep 22, 2020
86a64fa
rename pending to non_revoked
Sep 22, 2020
7585d6e
one more test
Sep 22, 2020
9534c2b
Merge branch 'master' into ao-validator-discovery-api
Sep 22, 2020
f83534c
extract utility function into util crate
Sep 22, 2020
cb97211
fix compilation in tests
Sep 22, 2020
c1da4c6
Apply suggestions from code review
Sep 23, 2020
c6aa649
Merge branch 'master' into ao-validator-discovery-api
Sep 23, 2020
ae7f529
revert pin_project removal
Sep 23, 2020
fbf8901
fix while let loop
Sep 23, 2020
78216fc
Revert "revert pin_project removal"
Sep 23, 2020
4cb79ad
fix compilation
Sep 23, 2020
0295436
Update node/subsystem/src/messages.rs
Sep 23, 2020
66a6eed
Merge branch 'master' into ao-validator-discovery-api
Sep 28, 2020
7e67489
docs on pub items
Sep 28, 2020
30da479
guide updates
Sep 28, 2020
9c5b654
Merge branch 'master' into ao-validator-discovery-api
Sep 28, 2020
0e9771c
remove a TODO
Sep 28, 2020
4cc5f3e
small guide update
Sep 28, 2020
23bde8d
fix a typo
Sep 28, 2020
88e83ed
link to the issue
Sep 28, 2020
3893324
Merge branch 'master' into ao-validator-discovery-api
Oct 6, 2020
a7b5ddc
validator discovery: on_request docs
Oct 6, 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
fix while let loop
  • Loading branch information
Andronik Ordian committed Sep 23, 2020
commit fbf8901e577bad30c432222cf812959e79adefa9
6 changes: 2 additions & 4 deletions node/network/collator-protocol/src/collator_side.rs
Original file line number Diff line number Diff line change
Expand Up @@ -590,14 +590,12 @@ where
Communication { msg } => process_msg(&mut ctx, &mut state, msg).await?,
Signal(ActiveLeaves(_update)) => {}
Signal(BlockFinalized(_)) => {}
Signal(Conclude) => break,
Signal(Conclude) => return Ok(()),
}
}

futures::pending!();
futures::pending!()
}

Ok(())
}

#[cfg(test)]
Expand Down