balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

P2p: remove compilation warning in unit test

Browse Source
This commit is contained in:
Grégoire Henry 2017-04-11 00:57:34 +02:00
parent e276b0566e
commit 77d6805664
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/p2p/test_p2p_connection.ml
View File

@ -64,7 +64,7 @@ let sync_nodes nodes =
sync_nodes nodes >>= function sync_nodes nodes >>= function
| Ok () | Error (Exn End_of_file :: _) -> | Ok () | Error (Exn End_of_file :: _) ->
return () return ()
| Error e as err -> | Error _ as err ->
Lwt.return err Lwt.return err
let run_nodes client server = let run_nodes client server =
@ -147,7 +147,7 @@ module Low_level = struct
return () return ()
let server _ch sched socket = let server _ch sched socket =
raw_accept sched socket >>= fun (fd, point) -> raw_accept sched socket >>= fun (fd, _point) ->
P2p_io_scheduler.write fd simple_msg >>=? fun () -> P2p_io_scheduler.write fd simple_msg >>=? fun () ->
P2p_io_scheduler.close fd >>=? fun _ -> P2p_io_scheduler.close fd >>=? fun _ ->
return () return ()
@ -190,7 +190,7 @@ module Kicked = struct
let encoding = Data_encoding.bytes let encoding = Data_encoding.bytes
let server _ch sched socket = let server _ch sched socket =
accept sched socket >>=? fun (info, auth_fd) -> accept sched socket >>=? fun (_info, auth_fd) ->
P2p_connection.accept auth_fd encoding >>= fun conn -> P2p_connection.accept auth_fd encoding >>= fun conn ->
_assert (Kick.is_rejected conn) __LOC__ "" >>=? fun () -> _assert (Kick.is_rejected conn) __LOC__ "" >>=? fun () ->
return () return ()
@ -212,7 +212,7 @@ module Simple_message = struct
let simple_msg2 = MBytes.create (1 lsl 4) let simple_msg2 = MBytes.create (1 lsl 4)
let server ch sched socket = let server ch sched socket =
accept sched socket >>=? fun (info, auth_fd) -> accept sched socket >>=? fun (_info, auth_fd) ->
P2p_connection.accept auth_fd encoding >>=? fun conn -> P2p_connection.accept auth_fd encoding >>=? fun conn ->
P2p_connection.write_sync conn simple_msg >>=? fun () -> P2p_connection.write_sync conn simple_msg >>=? fun () ->
P2p_connection.read conn >>=? fun (_msg_size, msg) -> P2p_connection.read conn >>=? fun (_msg_size, msg) ->
@ -242,7 +242,7 @@ module Close_on_read = struct
let simple_msg = MBytes.create (1 lsl 4) let simple_msg = MBytes.create (1 lsl 4)
let server _ch sched socket = let server _ch sched socket =
accept sched socket >>=? fun (info, auth_fd) -> accept sched socket >>=? fun (_info, auth_fd) ->
P2p_connection.accept auth_fd encoding >>=? fun conn -> P2p_connection.accept auth_fd encoding >>=? fun conn ->
P2p_connection.close conn >>= fun _stat -> P2p_connection.close conn >>= fun _stat ->
return () return ()
@ -266,7 +266,7 @@ module Close_on_write = struct
let simple_msg = MBytes.create (1 lsl 4) let simple_msg = MBytes.create (1 lsl 4)
let server ch sched socket = let server ch sched socket =
accept sched socket >>=? fun (info, auth_fd) -> accept sched socket >>=? fun (_info, auth_fd) ->
P2p_connection.accept auth_fd encoding >>=? fun conn -> P2p_connection.accept auth_fd encoding >>=? fun conn ->
P2p_connection.close conn >>= fun _stat -> P2p_connection.close conn >>= fun _stat ->
sync ch >>=? fun ()-> sync ch >>=? fun ()->
@ -291,8 +291,8 @@ module Garbled_data = struct
let garbled_msg = MBytes.create (1 lsl 4) let garbled_msg = MBytes.create (1 lsl 4)
let server ch sched socket = let server _ch sched socket =
accept sched socket >>=? fun (info, auth_fd) -> accept sched socket >>=? fun (_info, auth_fd) ->
P2p_connection.accept auth_fd encoding >>=? fun conn -> P2p_connection.accept auth_fd encoding >>=? fun conn ->
P2p_connection.raw_write_sync conn garbled_msg >>=? fun () -> P2p_connection.raw_write_sync conn garbled_msg >>=? fun () ->
P2p_connection.read conn >>= fun err -> P2p_connection.read conn >>= fun err ->
@ -300,7 +300,7 @@ module Garbled_data = struct
P2p_connection.close conn >>= fun _stat -> P2p_connection.close conn >>= fun _stat ->
return () return ()
let client ch sched addr port = let client _ch sched addr port =
connect sched addr port id2 >>=? fun auth_fd -> connect sched addr port id2 >>=? fun auth_fd ->
P2p_connection.accept auth_fd encoding >>=? fun conn -> P2p_connection.accept auth_fd encoding >>=? fun conn ->
P2p_connection.read conn >>= fun err -> P2p_connection.read conn >>= fun err ->
@ -328,7 +328,7 @@ let spec = Arg.[
let main () = let main () =
let open Utils in let open Utils in
let anon_fun num_peers = raise (Arg.Bad "No anonymous argument.") in let anon_fun _num_peers = raise (Arg.Bad "No anonymous argument.") in
let usage_msg = "Usage: %s.\nArguments are:" in let usage_msg = "Usage: %s.\nArguments are:" in
Arg.parse spec anon_fun usage_msg ; Arg.parse spec anon_fun usage_msg ;
Test.run "p2p-connection." [ Test.run "p2p-connection." [

8
test/p2p/test_p2p_connection_pool.ml
View File

@ -54,7 +54,7 @@ let sync_nodes nodes =
sync_nodes nodes >>= function sync_nodes nodes >>= function
| Ok () | Error (Exn End_of_file :: _) -> | Ok () | Error (Exn End_of_file :: _) ->
return () return ()
| Error e as err -> | Error _ as err ->
Lwt.return err Lwt.return err
let detach_node f points n = let detach_node f points n =
@ -100,7 +100,7 @@ let detach_node f points n =
return () return ()
end end
let detach_nodes ?(sync = 0) run_node points = let detach_nodes run_node points =
let open Utils in let open Utils in
let clients = List.length points in let clients = List.length points in
Lwt_list.map_p Lwt_list.map_p
@ -196,7 +196,7 @@ module Random_connections = struct
let rem = ref (n * total) in let rem = ref (n * total) in
iter_p (fun point -> connect_random pool total rem point n) points iter_p (fun point -> connect_random pool total rem point n) points
let node repeat channel pool points = let node repeat _channel pool points =
lwt_log_info "Begin random connections." >>= fun () -> lwt_log_info "Begin random connections." >>= fun () ->
connect_random_all pool points repeat >>=? fun () -> connect_random_all pool points repeat >>=? fun () ->
lwt_log_info "Random connections OK." >>= fun () -> lwt_log_info "Random connections OK." >>= fun () ->
@ -267,7 +267,7 @@ let spec = Arg.[
let main () = let main () =
let open Utils in let open Utils in
let anon_fun num_peers = raise (Arg.Bad "No anonymous argument.") in let anon_fun _num_peers = raise (Arg.Bad "No anonymous argument.") in
let usage_msg = "Usage: %s <num_peers>.\nArguments are:" in let usage_msg = "Usage: %s <num_peers>.\nArguments are:" in
Arg.parse spec anon_fun usage_msg ; Arg.parse spec anon_fun usage_msg ;
let ports = !port -- (!port + !clients - 1) in let ports = !port -- (!port + !clients - 1) in