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

Baker: fix operation ordering...

Browse Source
This commit is contained in:
Grégoire Henry 2017-03-02 15:45:06 +01:00
parent 257a3972df
commit bed575d506
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/proto/alpha/apply.ml
View File

@ -274,8 +274,8 @@ let empty_result =
let compare_operations op1 op2 = let compare_operations op1 op2 =
match op1.contents, op2.contents with match op1.contents, op2.contents with
| Anonymous_operations _, Anonymous_operations _ -> 0 | Anonymous_operations _, Anonymous_operations _ -> 0
| Anonymous_operations _, Sourced_operations _ -> 1 | Anonymous_operations _, Sourced_operations _ -> -1
| Sourced_operations _, Anonymous_operations _ -> -1 | Sourced_operations _, Anonymous_operations _ -> 1
| Sourced_operations op1, Sourced_operations op2 -> | Sourced_operations op1, Sourced_operations op2 ->
match op1, op2 with match op1, op2 with
| Delegate_operations _, Manager_operations _ -> -1 | Delegate_operations _, Manager_operations _ -> -1
@ -293,7 +293,7 @@ let merge_result r r' =
| None, None -> None | None, None -> None
| Some x, None -> Some x | Some x, None -> Some x
| _, Some y -> Some y in | _, Some y -> Some y in
{ applied = r.applied @ r'.applied ; { applied = r'.applied @ r.applied ;
refused = Operation_hash.Map.merge merge r.refused r'.refused ; refused = Operation_hash.Map.merge merge r.refused r'.refused ;
branch_refused = branch_refused =
Operation_hash.Map.merge merge r.branch_refused r'.branch_refused ; Operation_hash.Map.merge merge r.branch_refused r'.branch_refused ;