Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow reversed fields in Fee_excess JSON #10871

Merged
merged 2 commits into from
May 6, 2022
Merged

Allow reversed fields in Fee_excess JSON #10871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ba5393
Allow reversed fields in Fee_excess JSON
psteckler May 5, 2022
155c14c
Merge branch 'compatible' into fix/fee-excess-liberal-of-yojson
mrmr1993 May 6, 2022
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
34 changes: 24 additions & 10 deletions src/lib/mina_base/fee_excess.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,30 @@ module Poly = struct
]

let of_yojson token_of_yojson fee_of_yojson = function
| `List
[ `Assoc [ ("token", fee_token_l); ("amount", fee_excess_l) ]
; `Assoc [ ("token", fee_token_r); ("amount", fee_excess_r) ]
] ->
let open Result.Let_syntax in
let%map fee_token_l = token_of_yojson fee_token_l
and fee_excess_l = fee_of_yojson fee_excess_l
and fee_token_r = token_of_yojson fee_token_r
and fee_excess_r = fee_of_yojson fee_excess_r in
{ fee_token_l; fee_excess_l; fee_token_r; fee_excess_r }
| `List [ `Assoc [ left0; left1 ]; `Assoc [ right0; right1 ] ] -> (
(* allow for reversed field order: "be liberal in what you accept" *)
let token_and_excess pair0 pair1 =
match (pair0, pair1) with
| ("token", token), ("amount", excess) ->
Some (token, excess)
| ("amount", excess), ("token", token) ->
Some (token, excess)
| _ ->
None
in
let left = token_and_excess left0 left1 in
let right = token_and_excess right0 right1 in
match (left, right) with
| Some (fee_token_l, fee_excess_l), Some (fee_token_r, fee_excess_r)
->
let open Result.Let_syntax in
let%map fee_token_l = token_of_yojson fee_token_l
and fee_excess_l = fee_of_yojson fee_excess_l
and fee_token_r = token_of_yojson fee_token_r
and fee_excess_r = fee_of_yojson fee_excess_r in
{ fee_token_l; fee_excess_l; fee_token_r; fee_excess_r }
| _ ->
Error "Fee_excess.Poly.Stable.V1.t, unexpected JSON field" )
| _ ->
Error "Fee_excess.Poly.Stable.V1.t"
end
Expand Down