Skip to content

Add libp2p-request-response protocol. #1596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romanb merged 21 commits into from
Jun 29, 2020
Merged

Add libp2p-request-response protocol. #1596

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
489a8ae
Add the libp2p-request-response protocol.
May 12, 2020
521fe2d
Fix OneShotHandler usage in floodsub.
May 30, 2020
89ea70a
Custom ProtocolsHandler and multiple protocols.
Jun 3, 2020
e2a596d
Small doc clarification.
Jun 8, 2020
8128079
Merge branch 'master' into libp2p-request-response
romanb Jun 10, 2020
054811d
Merge branch 'master' into libp2p-request-response
romanb Jun 19, 2020
0b96c78
Merge branch 'master' into libp2p-request-response
romanb Jun 24, 2020
eb9c02d
Remove unnecessary Sync bounds.
romanb Jun 25, 2020
52d47ec
Remove redundant Clone constraint.
romanb Jun 25, 2020
54f56d8
Update protocols/request-response/Cargo.toml
romanb Jun 25, 2020
11777d7
Update dev-dependencies.
romanb Jun 25, 2020
a204f73
Update Cargo.tomls.
romanb Jun 25, 2020
f964bbc
Add changelog.
romanb Jun 25, 2020
fa2ee41
Remove Sync bound from RequestResponseCodec::Protocol.
romanb Jun 26, 2020
9c6e6b4
Try async-trait.
romanb Jun 27, 2020
7bfdff5
Allow checking whether a ResponseChannel is still open.
romanb Jun 27, 2020
2ec63e5
Add `RequestResponse::is_pending`.
romanb Jun 28, 2020
69d13fe
Merge remote-tracking branch 'upstream/master' into libp2p-request-re…
Jun 29, 2020
216fca4
Revert now unnecessary changes to the OneShotHandler.
Jun 29, 2020
9fadb3f
Update CHANGELOG for libp2p-swarm.
Jun 29, 2020
48ad16a
Merge branch 'master' into libp2p-request-response
Jun 29, 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 OneShotHandler usage in floodsub.
  • Loading branch information
Roman S. Borschel committed May 30, 2020
commit 521fe2d6221abb8a59b08a0ac6d228490a7973bf
11 changes: 6 additions & 5 deletions protocols/floodsub/src/layer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use libp2p_swarm::{
NetworkBehaviourAction,
PollParameters,
ProtocolsHandler,
OneShotEvent,
OneShotHandler,
NotifyHandler,
DialPeerCondition,
Expand Down Expand Up @@ -237,7 +238,7 @@ impl Floodsub {
}

impl NetworkBehaviour for Floodsub {
type ProtocolsHandler = OneShotHandler<FloodsubProtocol, FloodsubRpc, InnerMessage>;
type ProtocolsHandler = OneShotHandler<FloodsubProtocol, FloodsubRpc, InnerMessage, ()>;
type OutEvent = FloodsubEvent;

fn new_handler(&mut self) -> Self::ProtocolsHandler {
Expand Down Expand Up @@ -287,12 +288,12 @@ impl NetworkBehaviour for Floodsub {
&mut self,
propagation_source: PeerId,
_connection: ConnectionId,
event: InnerMessage,
event: OneShotEvent<InnerMessage, ()>,
) {
// We ignore successful sends event.
// We ignore successful sends or timeouts.
let event = match event {
InnerMessage::Rx(event) => event,
InnerMessage::Sent => return,
OneShotEvent::Success(InnerMessage::Rx(event)) => event,
OneShotEvent::Success(InnerMessage::Sent) | OneShotEvent::Timeout(()) => return,
};

// Update connected peers topics
Expand Down