@@ -35,7 +35,7 @@ async fn test_echo_messages(
3535) -> Result < ( ) , String > {
3636 // setting a naïve event handler to avoid appearing ERR messages in logs
3737 node1
38- . set_event_callback ( & |_| { } )
38+ . set_event_callback ( |_| { } )
3939 . expect ( "set event call back working" ) ;
4040
4141 let rx_waku_message: Arc < Mutex < WakuMessage > > = Arc :: new ( Mutex :: new ( WakuMessage :: default ( ) ) ) ;
@@ -109,18 +109,20 @@ async fn test_echo_messages(
109109 // Wait for the msg to arrive
110110 let rx_waku_message_cloned = rx_waku_message. clone ( ) ;
111111 for _ in 0 ..50 {
112- if let Ok ( msg) = rx_waku_message_cloned. lock ( ) {
112+ let message_received = if let Ok ( msg) = rx_waku_message_cloned. lock ( ) {
113113 // dbg!("The waku message value is: {:?}", msg);
114114 let payload = msg. payload . to_vec ( ) ;
115115 let payload_str = from_utf8 ( & payload) . expect ( "should be valid message" ) ;
116- if payload_str == ECHO_MESSAGE {
117- node1. stop ( ) . await ?;
118- node2. stop ( ) . await ?;
119- return Ok ( ( ) ) ;
120- }
116+ payload_str == ECHO_MESSAGE
121117 } else {
122- sleep ( Duration :: from_millis ( 100 ) ) . await ;
118+ false
119+ } ;
120+ if message_received {
121+ node1. stop ( ) . await ?;
122+ node2. stop ( ) . await ?;
123+ return Ok ( ( ) ) ;
123124 }
125+ sleep ( Duration :: from_millis ( 100 ) ) . await ;
124126 }
125127
126128 let node1 = node1. stop ( ) . await ?;
@@ -129,7 +131,7 @@ async fn test_echo_messages(
129131 node1. waku_destroy ( ) . await ?;
130132 node2. waku_destroy ( ) . await ?;
131133
132- return Err ( "Unexpected test ending" . to_string ( ) ) ;
134+ Err ( "Unexpected test ending" . to_string ( ) )
133135}
134136
135137#[ tokio:: test]
0 commit comments