@@ -128,23 +128,24 @@ mod tests {
128128 let mut writer = FramedWrite :: new ( write, FrameCodec :: new ( ) ) ;
129129
130130 if let Some ( Ok ( frame) ) = reader. next ( ) . await {
131- if frame. header . frame_type == FrameType :: Auth {
132- let auth_req: AuthRequest = Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
133-
134- let tunnel_id = Uuid :: new_v4 ( ) ;
135- let response = AuthResponse :: new (
136- tunnel_id,
137- auth_req
138- . requested_subdomain
139- . unwrap_or_else ( || "random" . to_string ( ) ) ,
140- "1.0.0" ,
141- 3600 ,
142- ) ;
143- let response_payload = Bytes :: from ( response. to_json_bytes ( ) . unwrap ( ) ) ;
144- let response_frame = Frame :: auth ( response_payload) . unwrap ( ) ;
145- writer. send ( response_frame) . await . unwrap ( ) ;
146- return true ;
131+ if frame. header . frame_type != FrameType :: Auth {
132+ return false ;
147133 }
134+ let auth_req: AuthRequest = Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
135+
136+ let tunnel_id = Uuid :: new_v4 ( ) ;
137+ let response = AuthResponse :: new (
138+ tunnel_id,
139+ auth_req
140+ . requested_subdomain
141+ . unwrap_or_else ( || "random" . to_string ( ) ) ,
142+ "1.0.0" ,
143+ 3600 ,
144+ ) ;
145+ let response_payload = Bytes :: from ( response. to_json_bytes ( ) . unwrap ( ) ) ;
146+ let response_frame = Frame :: auth ( response_payload) . unwrap ( ) ;
147+ writer. send ( response_frame) . await . unwrap ( ) ;
148+ return true ;
148149 }
149150 false
150151 } ) ;
@@ -162,10 +163,11 @@ mod tests {
162163 writer. send ( auth_frame) . await . unwrap ( ) ;
163164
164165 if let Some ( Ok ( frame) ) = reader. next ( ) . await {
165- if frame. header . frame_type == FrameType :: Auth {
166- let resp: AuthResponse = Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
167- return resp. assigned_subdomain == "myapp" ;
166+ if frame. header . frame_type != FrameType :: Auth {
167+ return false ;
168168 }
169+ let resp: AuthResponse = Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
170+ return resp. assigned_subdomain == "myapp" ;
169171 }
170172 false
171173 } ) ;
@@ -332,11 +334,12 @@ mod tests {
332334 writer. send ( settings_frame) . await . unwrap ( ) ;
333335
334336 if let Some ( Ok ( frame) ) = reader. next ( ) . await {
335- if frame. header . frame_type == FrameType :: Settings {
336- let client_settings: Settings =
337- Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
338- return Some ( client_settings) ;
337+ if frame. header . frame_type != FrameType :: Settings {
338+ return None ;
339339 }
340+ let client_settings: Settings =
341+ Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
342+ return Some ( client_settings) ;
340343 }
341344 None
342345 } ) ;
@@ -347,17 +350,18 @@ mod tests {
347350 let mut writer = FramedWrite :: new ( write, FrameCodec :: new ( ) ) ;
348351
349352 if let Some ( Ok ( frame) ) = reader. next ( ) . await {
350- if frame. header . frame_type == FrameType :: Settings {
351- let server_settings: Settings =
352- Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
353+ if frame. header . frame_type != FrameType :: Settings {
354+ return None ;
355+ }
356+ let server_settings: Settings =
357+ Message :: from_json_bytes ( & frame. payload ) . unwrap ( ) ;
353358
354- let client_settings = Settings :: new ( 50 , 30 , 32768 ) ;
355- let settings_payload = Bytes :: from ( client_settings. to_json_bytes ( ) . unwrap ( ) ) ;
356- let settings_frame = Frame :: settings ( settings_payload) . unwrap ( ) ;
357- writer. send ( settings_frame) . await . unwrap ( ) ;
359+ let client_settings = Settings :: new ( 50 , 30 , 32768 ) ;
360+ let settings_payload = Bytes :: from ( client_settings. to_json_bytes ( ) . unwrap ( ) ) ;
361+ let settings_frame = Frame :: settings ( settings_payload) . unwrap ( ) ;
362+ writer. send ( settings_frame) . await . unwrap ( ) ;
358363
359- return Some ( server_settings) ;
360- }
364+ return Some ( server_settings) ;
361365 }
362366 None
363367 } ) ;
0 commit comments