Skip to content
This repository was archived by the owner on Mar 5, 2024. It is now read-only.

removing old 'dialing' stream handling block #1322

Open
jeffgrunewald wants to merge 1 commit into
base: master
Choose a base branch
from
Open

removing old 'dialing' stream handling block #1322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions src/state_channel/blockchain_state_channels_client.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

-type state() :: #state{}.
-type stream_key() :: non_neg_integer() | string().
-type stream_val() :: undefined | dialing | {unverified, pid()} | pid().
-type stream_val() :: undefined | {unverified, dialing | pid()} | pid().
-type streams() :: #{stream_key() => stream_val()}.
-type waiting_packet() :: {Packet :: blockchain_helium_packet_v1:packet(), Region :: atom(), ReceivedTime :: non_neg_integer()}.
-type waiting_key() :: non_neg_integer() | string().
Expand Down Expand Up @@ -395,12 +395,10 @@ handle_packet(Packet, RoutesOrAddresses, Region, ReceivedTime, #state{swarm_tid=
lager:debug("stream undef dialing first, address: ~p", [Address]),
ok = dial(SCClientTransportHandler, SwarmTID, RouteOrAddress),
add_packet_to_waiting(Address, {Packet, Region, ReceivedTime}, add_stream(Address, dialing, StateAcc));
dialing ->
lager:debug("stream is still dialing queueing packet, address: ~p", [Address]),
add_packet_to_waiting(Address, {Packet, Region, ReceivedTime}, StateAcc);
{unverified, _Stream} ->
%% queue it until we get a banner
lager:debug("unverified stream, add_packet_to_waiting, address: ~p", [Address]),
%% this stream could be a pid or could still be `dialing'
lager:debug("unverified stream ~p, add_packet_to_waiting, address: ~p", [_Stream, Address]),
add_packet_to_waiting(Address, {Packet, Region, ReceivedTime}, StateAcc);
Stream ->
lager:debug("stream ~p, send_packet_when_v1, address: ~p", [Stream, Address]),
Expand All @@ -412,12 +410,10 @@ handle_packet(Packet, RoutesOrAddresses, Region, ReceivedTime, #state{swarm_tid=
lager:debug("stream undef dialing first, oui: ~p", [OUI]),
ok = dial(SCClientTransportHandler, SwarmTID, RouteOrAddress),
add_packet_to_waiting(OUI, {Packet, Region, ReceivedTime}, add_stream(OUI, dialing, StateAcc));
dialing ->
lager:debug("stream is still dialing queueing packet, oui: ~p", [OUI]),
add_packet_to_waiting(OUI, {Packet, Region, ReceivedTime}, StateAcc);
{unverified, _Stream} ->
%% queue it until we get a banner
lager:debug("unverified stream, add_packet_to_waiting, oui: ~p", [OUI]),
%% this stream could be a pid or could still be `dialing'
lager:debug("unverified stream ~p, add_packet_to_waiting, oui: ~p", [_Stream, OUI]),
add_packet_to_waiting(OUI, {Packet, Region, ReceivedTime}, StateAcc);
Stream ->
lager:debug("got stream: ~p, send_packet_or_offer, oui: ~p", [Stream, OUI]),
Expand Down