From c83813456ab71ec59b2f0ba64bd098b7c2e8d544 Mon Sep 17 00:00:00 2001 From: Tom Jack Date: Mon, 16 Dec 2019 14:32:10 -0600 Subject: [PATCH 1/5] Relocate .opam --- docker/distribution/generic/build.Dockerfile | 2 +- src/ligo.opam => ligo.opam | 0 scripts/install_native_dependencies.sh | 6 ++++-- scripts/install_vendors_deps.sh | 2 +- scripts/setup_switch.sh | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) rename src/ligo.opam => ligo.opam (100%) diff --git a/docker/distribution/generic/build.Dockerfile b/docker/distribution/generic/build.Dockerfile index e183fc683..0e072f10c 100644 --- a/docker/distribution/generic/build.Dockerfile +++ b/docker/distribution/generic/build.Dockerfile @@ -26,7 +26,7 @@ RUN opam update # Install ligo RUN sh scripts/install_vendors_deps.sh -RUN opam install -y ./src +RUN opam install -y . # Use the ligo binary as a default command ENTRYPOINT [ "/home/opam/.opam/4.07/bin/ligo" ] diff --git a/src/ligo.opam b/ligo.opam similarity index 100% rename from src/ligo.opam rename to ligo.opam diff --git a/scripts/install_native_dependencies.sh b/scripts/install_native_dependencies.sh index 46e354711..2a0e56903 100755 --- a/scripts/install_native_dependencies.sh +++ b/scripts/install_native_dependencies.sh @@ -14,7 +14,8 @@ then m4 \ libcap \ bubblewrap \ - rsync + rsync \ + git else apt-get update -qq @@ -27,5 +28,6 @@ else m4 \ libcap-dev \ bubblewrap \ - rsync + rsync \ + git fi diff --git a/scripts/install_vendors_deps.sh b/scripts/install_vendors_deps.sh index 3da674636..15f9b47d4 100755 --- a/scripts/install_vendors_deps.sh +++ b/scripts/install_vendors_deps.sh @@ -2,5 +2,5 @@ set -e # Install local dependencies -opam install -y --deps-only --with-test $(find src vendors -name \*.opam) +opam install -y --deps-only --with-test ./ligo.opam $(find vendors -name \*.opam) opam install -y $(find vendors -name \*.opam) diff --git a/scripts/setup_switch.sh b/scripts/setup_switch.sh index ee1179109..8810e4483 100755 --- a/scripts/setup_switch.sh +++ b/scripts/setup_switch.sh @@ -2,5 +2,5 @@ set -e set -x -printf '' | opam switch create . ocaml-base-compiler.4.07.1 # toto ocaml-base-compiler.4.06.1 +printf '' | opam switch create . ocaml-base-compiler.4.07.1 --no-install eval $(opam config env) From 3110ae87e1f9af38a0584298bebac1b494e21196 Mon Sep 17 00:00:00 2001 From: Tom Jack Date: Mon, 16 Dec 2019 14:33:16 -0600 Subject: [PATCH 2/5] Pass CI_JOB_ID to docker container --- docker/distribution/generic/build.Dockerfile | 3 +++ scripts/distribution/generic/build.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/distribution/generic/build.Dockerfile b/docker/distribution/generic/build.Dockerfile index 0e072f10c..f6c9358e9 100644 --- a/docker/distribution/generic/build.Dockerfile +++ b/docker/distribution/generic/build.Dockerfile @@ -1,6 +1,9 @@ ARG target FROM ocaml/opam2:${target} +ARG ci_job_id +ENV CI_JOB_ID=$ci_job_id + RUN opam switch 4.07 && eval $(opam env) USER root diff --git a/scripts/distribution/generic/build.sh b/scripts/distribution/generic/build.sh index 7f4a89e9a..49aba15e1 100755 --- a/scripts/distribution/generic/build.sh +++ b/scripts/distribution/generic/build.sh @@ -8,4 +8,4 @@ dockerfile="./docker/distribution/generic/build.Dockerfile" echo "Building LIGO for $target" echo "Using Dockerfile: $dockerfile" echo "Tagging as: $tag_build\n" -docker build --build-arg target="$target" -t "$tag_build" -f "$dockerfile" . \ No newline at end of file +docker build --build-arg ci_job_id="${CI_JOB_ID}" --build-arg target="$target" -t "$tag_build" -f "$dockerfile" . From ffb225e269278438ec5f7fa7b40e4d5df25e4949 Mon Sep 17 00:00:00 2001 From: Lesenechal Remi Date: Tue, 17 Dec 2019 11:10:29 +0100 Subject: [PATCH 3/5] fix address arity and update test --- src/passes/operators/operators.ml | 2 +- src/test/contracts/address.ligo | 6 +++++- src/test/contracts/address.mligo | 4 +++- src/test/contracts/address.religo | 5 ++++- src/test/integration_tests.ml | 21 +++++++++++++++------ 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml index 3ac7a0959..abb7a3339 100644 --- a/src/passes/operators/operators.ml +++ b/src/passes/operators/operators.ml @@ -920,7 +920,7 @@ module Compiler = struct | C_UNIT -> ok @@ simple_constant @@ prim I_UNIT | C_BALANCE -> ok @@ simple_constant @@ prim I_BALANCE | C_AMOUNT -> ok @@ simple_constant @@ prim I_AMOUNT - | C_ADDRESS -> ok @@ simple_constant @@ prim I_ADDRESS + | C_ADDRESS -> ok @@ simple_unary @@ prim I_ADDRESS | C_SELF_ADDRESS -> ok @@ simple_constant @@ seq [prim I_SELF; prim I_ADDRESS] | C_IMPLICIT_ACCOUNT -> ok @@ simple_unary @@ prim I_IMPLICIT_ACCOUNT | C_NOW -> ok @@ simple_constant @@ prim I_NOW diff --git a/src/test/contracts/address.ligo b/src/test/contracts/address.ligo index 555ab6fe7..2113bc7ac 100644 --- a/src/test/contracts/address.ligo +++ b/src/test/contracts/address.ligo @@ -1 +1,5 @@ -function main (const c: contract(unit)) : address is address(c) +// function main (const c: contract(unit)) : address is address(c) + +function main (const p : key_hash) : address is block { + const c : contract(unit) = implicit_account(p) ; +} with address(c) \ No newline at end of file diff --git a/src/test/contracts/address.mligo b/src/test/contracts/address.mligo index efca3d8b8..3651ea223 100644 --- a/src/test/contracts/address.mligo +++ b/src/test/contracts/address.mligo @@ -1 +1,3 @@ -let main (c: unit contract) : address = Current.address c +let main (p : key_hash) = + let c : unit contract = Current.implicit_account p in + Current.address c \ No newline at end of file diff --git a/src/test/contracts/address.religo b/src/test/contracts/address.religo index 1bab0004b..df1742ce1 100644 --- a/src/test/contracts/address.religo +++ b/src/test/contracts/address.religo @@ -1 +1,4 @@ -let main = (c: contract(unit)): address => Current.address(c); +let main = (p : key_hash) : address => { + let c : contract(unit) = Current.implicit_account(p) ; + Current.address(c) ; +}; diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml index 921a6a376..14cc41e23 100644 --- a/src/test/integration_tests.ml +++ b/src/test/integration_tests.ml @@ -1624,17 +1624,26 @@ let balance_constant_religo () : unit result = expect_eq program "main" input expected +let addr_test program = + let open Proto_alpha_utils.Memory_proto_alpha in + let addr = Protocol.Alpha_context.Contract.to_b58check @@ + (List.nth dummy_environment.identities 0).implicit_contract in + let open Tezos_crypto in + let key_hash = Signature.Public_key_hash.to_b58check @@ + (List.nth dummy_environment.identities 0).public_key_hash in + expect_eq program "main" (e_key_hash key_hash) (e_address addr) + let address () : unit result = - let%bind _ = type_file "./contracts/address.ligo" in - ok () + let%bind program = type_file "./contracts/address.ligo" in + addr_test program let address_mligo () : unit result = - let%bind _ = mtype_file "./contracts/address.mligo" in - ok () + let%bind program = mtype_file "./contracts/address.mligo" in + addr_test program let address_religo () : unit result = - let%bind _ = retype_file "./contracts/address.religo" in - ok () + let%bind program = retype_file "./contracts/address.religo" in + addr_test program let self_address () : unit result = From e6cb4e63c6864bc0e2f64ed8b3f12074e3df38d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lesenechal?= Date: Tue, 17 Dec 2019 14:18:09 +0000 Subject: [PATCH 4/5] Contracts: replaceable ID --- src/test/contracts/replaceable_id.ligo | 35 ++++++++++ src/test/replaceable_id_tests.ml | 90 ++++++++++++++++++++++++++ src/test/test.ml | 1 + 3 files changed, 126 insertions(+) create mode 100644 src/test/contracts/replaceable_id.ligo create mode 100644 src/test/replaceable_id_tests.ml diff --git a/src/test/contracts/replaceable_id.ligo b/src/test/contracts/replaceable_id.ligo new file mode 100644 index 000000000..3b116e69b --- /dev/null +++ b/src/test/contracts/replaceable_id.ligo @@ -0,0 +1,35 @@ +// storage type +type storage_t is address; + +// entry points parameter types +type change_addr_pt is address + +type message_t is list (operation) ; +type pass_message_pt is (unit -> message_t) + +type contract_return_t is (list(operation) * storage_t) + +type entry_point_t is +| Change_address of change_addr_pt +| Pass_message of pass_message_pt + +function change_address (const param : change_addr_pt; + const s : storage_t) : contract_return_t is + begin + if sender =/= s then failwith("Unauthorized sender") + else skip +end with ((nil : list(operation)), param) + +function pass_message ( const param: pass_message_pt; + const s : storage_t ) : contract_return_t is + begin + if sender =/= s then failwith("Unauthorized sender") else skip ; + var message : pass_message_pt := param ; +end with (param(unit),s) + +function main(const param : entry_point_t; const s : storage_t) : contract_return_t is +block {skip} with + case param of + | Change_address (p) -> change_address(p,s) + | Pass_message (p) -> pass_message(p,s) +end \ No newline at end of file diff --git a/src/test/replaceable_id_tests.ml b/src/test/replaceable_id_tests.ml new file mode 100644 index 000000000..ca04640c1 --- /dev/null +++ b/src/test/replaceable_id_tests.ml @@ -0,0 +1,90 @@ +open Trace +open Test_helpers + +let type_file f = + let%bind simplified = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in + let%bind typed,state = Ligo.Compile.Of_simplified.compile simplified in + ok @@ (typed,state) + +let get_program = + let s = ref None in + fun () -> match !s with + | Some s -> ok s + | None -> ( + let%bind program = type_file "./contracts/replaceable_id.ligo" in + s := Some program ; + ok program + ) + +let compile_main () = + let%bind simplified = Ligo.Compile.Of_source.compile "./contracts/replaceable_id.ligo" (Syntax_name "pascaligo") in + let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile simplified in + let%bind mini_c_prg = Ligo.Compile.Of_typed.compile typed_prg in + let%bind michelson_prg = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in + let%bind (_contract: Tezos_utils.Michelson.michelson) = + (* fails if the given entry point is not a valid contract *) + Ligo.Compile.Of_mini_c.build_contract michelson_prg in + ok () +open Ast_simplified + +let empty_op_list = + (e_typed_list [] t_operation) +let empty_message = e_lambda (Var.of_name "arguments") + (Some t_unit) (Some (t_list t_operation)) + empty_op_list + +let storage id = e_address @@ addr id +let entry_change_addr id = e_constructor "Change_address" + @@ e_address @@ addr @@ id +let entry_pass_message = e_constructor "Pass_message" + @@ empty_message + +let change_addr_success () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_change_addr 2 in + let options = + let source = contract 1 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + expect_eq ~options program "main" + (e_pair param init_storage) (e_pair empty_op_list (storage 2)) + +let change_addr_fail () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_change_addr 2 in + let options = + let source = contract 3 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + let exp_failwith = "Unauthorized sender" in + expect_string_failwith ~options program "main" + (e_pair param init_storage) exp_failwith + +let pass_message_success () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_pass_message in + let options = + let source = contract 1 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + expect_eq ~options program "main" + (e_pair param init_storage) (e_pair empty_op_list init_storage) + +let pass_message_fail () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_pass_message in + let options = + let source = contract 2 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + let exp_failwith = "Unauthorized sender" in + expect_string_failwith ~options program "main" + (e_pair param init_storage) exp_failwith + +let main = test_suite "Replaceable ID" [ + test "compile" compile_main ; + test "change_addr_success" change_addr_success ; + test "change_addr_fail" change_addr_fail ; + test "pass_message_success" pass_message_success ; + test "pass_message_fail" pass_message_fail ; + ] diff --git a/src/test/test.ml b/src/test/test.ml index 4db386e5e..b1cafc9cf 100644 --- a/src/test/test.ml +++ b/src/test/test.ml @@ -12,5 +12,6 @@ let () = Vote_tests.main ; Multisig_tests.main ; Multisig_v2_tests.main ; + Replaceable_id_tests.main ; ] ; () From 1bf3d8f02a3e8324e9dde48f0e4bb4e6df469205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzanne=20Dup=C3=A9ron?= Date: Mon, 16 Dec 2019 17:37:52 +0000 Subject: [PATCH 5/5] First negative tests for the old typer & improvement of error messages --- src/bin/cli.ml | 18 +++++++++--------- src/bin/cli_helpers.ml | 9 +++++---- src/bin/cli_helpers.mli | 3 ++- src/bin/expect_tests/typer_error_tests.ml | 11 +++++++++++ src/stages/ast_typed/misc.ml | 12 ++++++------ src/stages/common/PP.ml | 4 ++-- src/test/contracts/error_typer_1.mligo | 3 +++ src/test/contracts/error_typer_2.mligo | 3 +++ src/test/contracts/error_typer_3.mligo | 6 ++++++ 9 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 src/bin/expect_tests/typer_error_tests.ml create mode 100644 src/test/contracts/error_typer_1.mligo create mode 100644 src/test/contracts/error_typer_2.mligo create mode 100644 src/test/contracts/error_typer_3.mligo diff --git a/src/bin/cli.ml b/src/bin/cli.ml index 13cb7f761..6ab46b7f6 100644 --- a/src/bin/cli.ml +++ b/src/bin/cli.ml @@ -128,7 +128,7 @@ let compile_file = Term.(const f $ source_file 0 $ entry_point 1 $ syntax $ display_format $ michelson_code_format) in let cmdname = "compile-contract" in let doc = "Subcommand: compile a contract." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let measure_contract = let f source_file entry_point syntax display_format = @@ -145,7 +145,7 @@ let measure_contract = Term.(const f $ source_file 0 $ entry_point 1 $ syntax $ display_format) in let cmdname = "measure-contract" in let doc = "Subcommand: measure a contract's compiled size in bytes." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let compile_parameter = let f source_file entry_point expression syntax display_format michelson_format = @@ -176,7 +176,7 @@ let compile_parameter = Term.(const f $ source_file 0 $ entry_point 1 $ expression "PARAMETER" 2 $ syntax $ display_format $ michelson_code_format) in let cmdname = "compile-parameter" in let doc = "Subcommand: compile parameters to a michelson expression. The resulting michelson expression can be passed as an argument in a transaction which calls a contract." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let interpret = let f expression init_file syntax amount sender source display_format = @@ -204,7 +204,7 @@ let interpret = Term.(const f $ expression "EXPRESSION" 0 $ init_file $ syntax $ amount $ sender $ source $ display_format ) in let cmdname = "interpret" in let doc = "Subcommand: interpret the expression in the context initialized by the provided source file." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let compile_storage = @@ -236,7 +236,7 @@ let compile_storage = Term.(const f $ source_file 0 $ entry_point 1 $ expression "STORAGE" 2 $ syntax $ display_format $ michelson_code_format) in let cmdname = "compile-storage" in let doc = "Subcommand: compile an initial storage in ligo syntax to a michelson expression. The resulting michelson expression can be passed as an argument in a transaction which originates a contract." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let dry_run = let f source_file entry_point storage input amount sender source syntax display_format = @@ -267,7 +267,7 @@ let dry_run = Term.(const f $ source_file 0 $ entry_point 1 $ expression "PARAMETER" 2 $ expression "STORAGE" 3 $ amount $ sender $ source $ syntax $ display_format) in let cmdname = "dry-run" in let doc = "Subcommand: run a smart-contract with the given storage and input." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let run_function = let f source_file entry_point parameter amount sender source syntax display_format = @@ -293,7 +293,7 @@ let run_function = Term.(const f $ source_file 0 $ entry_point 1 $ expression "PARAMETER" 2 $ amount $ sender $ source $ syntax $ display_format) in let cmdname = "run-function" in let doc = "Subcommand: run a function with the given parameter." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let evaluate_value = let f source_file entry_point amount sender source syntax display_format = @@ -312,7 +312,7 @@ let evaluate_value = Term.(const f $ source_file 0 $ entry_point 1 $ amount $ sender $ source $ syntax $ display_format) in let cmdname = "evaluate-value" in let doc = "Subcommand: evaluate a given definition." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let compile_expression = let f expression syntax display_format michelson_format = @@ -331,7 +331,7 @@ let compile_expression = Term.(const f $ expression "" 1 $ req_syntax 0 $ display_format $ michelson_code_format) in let cmdname = "compile-expression" in let doc = "Subcommand: compile to a michelson value." in - (term , Term.info ~doc cmdname) + (Term.ret term , Term.info ~doc cmdname) let run ?argv () = Term.eval_choice ?argv main [ diff --git a/src/bin/cli_helpers.ml b/src/bin/cli_helpers.ml index cb25dd084..34a4834a1 100644 --- a/src/bin/cli_helpers.ml +++ b/src/bin/cli_helpers.ml @@ -1,9 +1,10 @@ +open Cmdliner open Trace open Main.Display -let toplevel ~(display_format : display_format) (x : string result) = +let toplevel ~(display_format : display_format) (x : string result) : unit Term.ret = match x with - | Ok _ -> Format.printf "%a%!" (formatted_string_result_pp display_format) x + | Ok _ -> Format.printf "%a%!" (formatted_string_result_pp display_format) x; + `Ok () | Error _ -> - Format.eprintf "%a%!" (formatted_string_result_pp display_format) x ; - exit 1 + `Error (false, Format.asprintf "%a%!" (formatted_string_result_pp display_format) x) diff --git a/src/bin/cli_helpers.mli b/src/bin/cli_helpers.mli index e3e57f0a5..f19e281a9 100644 --- a/src/bin/cli_helpers.mli +++ b/src/bin/cli_helpers.mli @@ -1,3 +1,4 @@ +open Cmdliner open Trace -val toplevel : display_format : Main.Display.display_format -> string result -> unit +val toplevel : display_format : Main.Display.display_format -> string result -> unit Term.ret diff --git a/src/bin/expect_tests/typer_error_tests.ml b/src/bin/expect_tests/typer_error_tests.ml new file mode 100644 index 000000000..5a407316f --- /dev/null +++ b/src/bin/expect_tests/typer_error_tests.ml @@ -0,0 +1,11 @@ +open Cli_expect + +let%expect_test _ = + run_ligo_bad [ "compile-contract" ; "../../test/contracts/error_typer_1.mligo" ; "foo" ] ; + [%expect {| ligo: in file "error_typer_1.mligo", line 3, characters 19-27. different type constructors: Expected these two constant type constructors to be the same, but they're different {"a":"string","b":"int"} |} ] ; + + run_ligo_bad [ "compile-contract" ; "../../test/contracts/error_typer_2.mligo" ; "foo" ] ; + [%expect {| ligo: in file "error_typer_2.mligo", line 3, characters 24-39. different type constructors: Expected these two n-ary type constructors to be the same, but they're different {"a":"(TO_list(string))","b":"(TO_option(int))"} |} ] ; + + (* run_ligo_bad [ "compile-contract" ; "../../test/contracts/error_typer_3.mligo" ; "foo" ] ; + * [%expect …some type error… ] ; *) diff --git a/src/stages/ast_typed/misc.ml b/src/stages/ast_typed/misc.ml index 92b3d95b6..4303a6f1b 100644 --- a/src/stages/ast_typed/misc.ml +++ b/src/stages/ast_typed/misc.ml @@ -12,16 +12,16 @@ module Errors = struct error ~data title message () let different_constants a b () = - let title = (thunk "different type constants") in - let message () = "" in + let title = (thunk "different type constructors") in + let message () = "Expected these two constant type constructors to be the same, but they're different" in let data = [ ("a" , fun () -> Format.asprintf "%a" Stage_common.PP.type_constant a) ; ("b" , fun () -> Format.asprintf "%a" Stage_common.PP.type_constant b ) ] in error ~data title message () let different_operators a b () = - let title = (thunk "different type operators") in - let message () = "" in + let title = (thunk "different type constructors") in + let message () = "Expected these two n-ary type constructors to be the same, but they're different" in let data = [ ("a" , fun () -> Format.asprintf "%a" (Stage_common.PP.type_operator PP.type_value) a) ; ("b" , fun () -> Format.asprintf "%a" (Stage_common.PP.type_operator PP.type_value) b) @@ -30,7 +30,7 @@ module Errors = struct let different_size_type name a b () = let title () = name ^ " have different sizes" in - let message () = "" in + let message () = "Expected these two types to be the same, but they're different (both are " ^ name ^ ", but with a different number of arguments)" in let data = [ ("a" , fun () -> Format.asprintf "%a" PP.type_value a) ; ("b" , fun () -> Format.asprintf "%a" PP.type_value b ) @@ -46,7 +46,7 @@ module Errors = struct ] in error ~data title message () - let _different_size_constants = different_size_type "constants" + let _different_size_constants = different_size_type "type constructors" let different_size_tuples = different_size_type "tuples" diff --git a/src/stages/common/PP.ml b/src/stages/common/PP.ml index e32e9dd52..411681a2a 100644 --- a/src/stages/common/PP.ml +++ b/src/stages/common/PP.ml @@ -149,7 +149,7 @@ let rec type_expression' : type a . (formatter -> a -> unit) -> formatter -> a t | T_operator to_ -> type_operator f ppf to_ and type_constant ppf (tc:type_constant) : unit = - let s = match tc with + let s = match tc with | TC_unit -> "unit" | TC_string -> "string" | TC_bytes -> "bytes" @@ -165,7 +165,7 @@ and type_constant ppf (tc:type_constant) : unit = | TC_timestamp -> "timestamp" | TC_chain_id -> "chain_id" in - fprintf ppf "(TC %s)" s + fprintf ppf "%s" s and type_operator : type a . (formatter -> a -> unit) -> formatter -> a type_operator -> unit = diff --git a/src/test/contracts/error_typer_1.mligo b/src/test/contracts/error_typer_1.mligo new file mode 100644 index 000000000..b39f46dd9 --- /dev/null +++ b/src/test/contracts/error_typer_1.mligo @@ -0,0 +1,3 @@ +type toto = int + +let foo : string = 42 + 127 diff --git a/src/test/contracts/error_typer_2.mligo b/src/test/contracts/error_typer_2.mligo new file mode 100644 index 000000000..77534fee2 --- /dev/null +++ b/src/test/contracts/error_typer_2.mligo @@ -0,0 +1,3 @@ +type toto = int option + +let foo : string list = Some (42 + 127) diff --git a/src/test/contracts/error_typer_3.mligo b/src/test/contracts/error_typer_3.mligo new file mode 100644 index 000000000..ce6e637ef --- /dev/null +++ b/src/test/contracts/error_typer_3.mligo @@ -0,0 +1,6 @@ +type toto = (int * string) + +let foo : (int * string * bool) = ((1, "foo") : toto) + +let main (p:int) (storage : int) = + (([] : operation list) , p + foo.0)