Skip to content

refactor(relay): introduce Handler::new functions #3334

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
mergify merged 7 commits into from
Jan 18, 2023
Merged

refactor(relay): introduce Handler::new functions #3334

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3a84c14
Use single quotes to avoid running commands
thomaseizinger Jan 11, 2023
458aa53
Use intermediary variable
thomaseizinger Jan 13, 2023
79c84fb
Introduce Handler::new
thomaseizinger Jan 16, 2023
341d096
Merge branch 'master' into no-run-title-as-command
thomaseizinger Jan 16, 2023
4262481
Merge branch 'no-run-title-as-command' into 2824-handler-new-fns
thomaseizinger Jan 16, 2023
a3c8562
Merge branch 'master' into 2824-handler-new-fns
thomaseizinger Jan 17, 2023
6b403c7
Merge branch 'master' into 2824-handler-new-fns
mergify[bot] Jan 18, 2023
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
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,12 @@ jobs:
require_scope: false

- name: Check PR title length
env:
TITLE: ${{ github.event.pull_request.title }}
run: |
title="${{ github.event.pull_request.title }}"
title_length=${#title}
title_length=${#TITLE}
if [ $title_length -gt 72 ]
then
echo "PR title is too long (greater than 72 characters)"
exit 1
fi
fi
30 changes: 17 additions & 13 deletions protocols/relay/src/behaviour/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,19 +351,7 @@ impl IntoConnectionHandler for Prototype {
// Deny all substreams on relayed connection.
Either::Right(dummy::ConnectionHandler)
} else {
Either::Left(Handler {
endpoint: endpoint.clone(),
config: self.config,
queued_events: Default::default(),
pending_error: Default::default(),
reservation_request_future: Default::default(),
circuit_accept_futures: Default::default(),
circuit_deny_futures: Default::default(),
alive_lend_out_substreams: Default::default(),
circuits: Default::default(),
active_reservation: Default::default(),
keep_alive: KeepAlive::Yes,
})
Either::Left(Handler::new(self.config, endpoint.clone()))
}
}

Expand Down Expand Up @@ -432,6 +420,22 @@ pub struct Handler {
}

impl Handler {
fn new(config: Config, endpoint: ConnectedPoint) -> Handler {
Handler {
endpoint,
config,
queued_events: Default::default(),
pending_error: Default::default(),
reservation_request_future: Default::default(),
circuit_accept_futures: Default::default(),
circuit_deny_futures: Default::default(),
alive_lend_out_substreams: Default::default(),
circuits: Default::default(),
active_reservation: Default::default(),
keep_alive: KeepAlive::Yes,
}
}

fn on_fully_negotiated_inbound(
&mut self,
FullyNegotiatedInbound {
Expand Down
32 changes: 20 additions & 12 deletions protocols/relay/src/priv_client/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,11 @@ impl IntoConnectionHandler for Prototype {
// Deny all substreams on relayed connection.
Either::Right(dummy::ConnectionHandler)
} else {
let mut handler = Handler {
remote_peer_id: *remote_peer_id,
remote_addr: endpoint.get_remote_address().clone(),
local_peer_id: self.local_peer_id,
queued_events: Default::default(),
pending_error: Default::default(),
reservation: Reservation::None,
alive_lend_out_substreams: Default::default(),
circuit_deny_futs: Default::default(),
send_error_futs: Default::default(),
keep_alive: KeepAlive::Yes,
};
let mut handler = Handler::new(
self.local_peer_id,
*remote_peer_id,
endpoint.get_remote_address().clone(),
);

if let Some(event) = self.initial_in {
handler.on_behaviour_event(event)
Expand Down Expand Up @@ -213,6 +206,21 @@ pub struct Handler {
}

impl Handler {
fn new(local_peer_id: PeerId, remote_peer_id: PeerId, remote_addr: Multiaddr) -> Self {
Self {
local_peer_id,
remote_peer_id,
remote_addr,
queued_events: Default::default(),
pending_error: Default::default(),
reservation: Reservation::None,
alive_lend_out_substreams: Default::default(),
circuit_deny_futs: Default::default(),
send_error_futs: Default::default(),
keep_alive: KeepAlive::Yes,
}
}

fn on_fully_negotiated_inbound(
&mut self,
FullyNegotiatedInbound {
Expand Down