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

Fix merge conflict

Browse Source
This commit is contained in:
Tom Jack 2019-11-06 07:35:15 -06:00
parent 70a9afcce2
commit a69d084d0a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/contracts/bytes_arithmetic.mligo
View File

@ -2,7 +2,7 @@ let concat_op (s : bytes) : bytes =
Bytes.concat s ("7070" : bytes) Bytes.concat s ("7070" : bytes)
let slice_op (s : bytes) : bytes = let slice_op (s : bytes) : bytes =
Bytes.slice 1p 2p s Bytes.slice 1n 2n s
let hasherman (s : bytes) : bytes = let hasherman (s : bytes) : bytes =
Crypto.sha256 s Crypto.sha256 s

4
src/test/integration_tests.ml
View File

@ -303,9 +303,9 @@ let bytes_arithmetic_mligo () : unit result =
let%bind () = expect_eq program "slice_op" tata at in let%bind () = expect_eq program "slice_op" tata at in
let%bind () = expect_fail program "slice_op" foo in let%bind () = expect_fail program "slice_op" foo in
let%bind () = expect_fail program "slice_op" ba in let%bind () = expect_fail program "slice_op" ba in
let%bind b1 = Run.Of_simplified.run_typed_program program "hasherman" foo in let%bind b1 = Run.Of_simplified.run_typed_program program Typer.Solver.initial_state "hasherman" foo in
let%bind () = expect_eq program "hasherman" foo b1 in let%bind () = expect_eq program "hasherman" foo b1 in
let%bind b3 = Run.Of_simplified.run_typed_program program "hasherman" foototo in let%bind b3 = Run.Of_simplified.run_typed_program program Typer.Solver.initial_state "hasherman" foototo in
let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b3 , b1) in let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b3 , b1) in
ok () ok ()