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

P2p_pool: fix ambiguous JSON union case

Browse Source
This commit is contained in:
Milo Davis 2018-03-27 18:04:51 -04:00 committed by Grégoire Henry
parent ebfdeea8d5
commit 7a43c5bc41
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib_p2p/p2p_pool.ml
View File

@ -39,32 +39,43 @@ module Message = struct
let open Data_encoding in let open Data_encoding in
dynamic_size @@ dynamic_size @@
union ~tag_size:`Uint16 union ~tag_size:`Uint16
([ case (Tag 0x01) ~name:"Disconnect" null ([ case (Tag 0x01) ~name:"Disconnect"
(obj1 (req "kind" (constant "Disconnect")))
(function Disconnect -> Some () | _ -> None) (function Disconnect -> Some () | _ -> None)
(fun () -> Disconnect); (fun () -> Disconnect);
case (Tag 0x02) ~name:"Bootstrap" null case (Tag 0x02) ~name:"Bootstrap"
(obj1 (req "kind" (constant "Bootstrap")))
(function Bootstrap -> Some () | _ -> None) (function Bootstrap -> Some () | _ -> None)
(fun () -> Bootstrap); (fun () -> Bootstrap);
case (Tag 0x03) ~name:"Advertise" (Variable.list P2p_point.Id.encoding) case (Tag 0x03) ~name:"Advertise"
(function Advertise points -> Some points | _ -> None) (obj2
(fun points -> Advertise points); (req "id" (Variable.list P2p_point.Id.encoding))
(req "kind" (constant "Advertise")))
(function Advertise points -> Some (points, ()) | _ -> None)
(fun (points, ()) -> Advertise points);
case (Tag 0x04) ~name:"Swap_request" case (Tag 0x04) ~name:"Swap_request"
(tup2 P2p_point.Id.encoding P2p_peer.Id.encoding) (obj3
(req "point" P2p_point.Id.encoding)
(req "peer_id" P2p_peer.Id.encoding)
(req "kind" (constant "Swap_request")))
(function (function
| Swap_request (point, peer_id) -> Some (point, peer_id) | Swap_request (point, peer_id) -> Some (point, peer_id, ())
| _ -> None) | _ -> None)
(fun (point, peer_id) -> Swap_request (point, peer_id)) ; (fun (point, peer_id, ()) -> Swap_request (point, peer_id)) ;
case (Tag 0x05) case (Tag 0x05)
~name:"Swap_ack" ~name:"Swap_ack"
(tup2 P2p_point.Id.encoding P2p_peer.Id.encoding) (obj3
(req "point" P2p_point.Id.encoding)
(req "peer_id" P2p_peer.Id.encoding)
(req "kind" (constant "Swap_ack")))
(function (function
| Swap_ack (point, peer_id) -> Some (point, peer_id) | Swap_ack (point, peer_id) -> Some (point, peer_id, ())
| _ -> None) | _ -> None)
(fun (point, peer_id) -> Swap_ack (point, peer_id)) ; (fun (point, peer_id, ()) -> Swap_ack (point, peer_id)) ;
] @ ] @
ListLabels.map msg_encoding ListLabels.map msg_encoding
~f:(function Encoding { tag ; encoding ; wrap ; unwrap } -> ~f:(function Encoding { tag ; encoding ; wrap ; unwrap } ->
case (Tag tag) encoding Data_encoding.case (Tag tag) encoding
(function Message msg -> unwrap msg | _ -> None) (function Message msg -> unwrap msg | _ -> None)
(fun msg -> Message (wrap msg)))) (fun msg -> Message (wrap msg))))