From e63f2407c2ff4301ed54f07851f4fd9de6848784 Mon Sep 17 00:00:00 2001 From: Lesenechal Remi Date: Thu, 13 Feb 2020 14:09:45 +0100 Subject: [PATCH] carthage update: * update dune & opam files * update modules in source --- src/main/run/of_michelson.ml | 4 ++-- vendors/ligo-utils/memory-proto-alpha/dune | 2 +- .../memory-proto-alpha/memory_proto_alpha.ml | 4 ++-- .../memory-proto-alpha/tezos-memory-proto-alpha.opam | 2 +- vendors/ligo-utils/proto-alpha-utils/dune | 4 ++-- .../ligo-utils/proto-alpha-utils/init_proto_alpha.ml | 2 +- .../proto-alpha-utils/proto-alpha-utils.opam | 2 +- .../ligo-utils/tezos-protocol-alpha-parameters/dune | 12 ++++++------ .../tezos-protocol-alpha-parameters/dune-project | 2 +- ...m => tezos-protocol-006-PsCARTHA-parameters.opam} | 7 ++++--- .../ligo-utils/tezos-protocol-alpha/TEZOS_PROTOCOL | 2 +- vendors/ligo-utils/tezos-protocol-alpha/dune-project | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) rename vendors/ligo-utils/tezos-protocol-alpha-parameters/{tezos-protocol-005-PsBabyM1-parameters.opam => tezos-protocol-006-PsCARTHA-parameters.opam} (73%) diff --git a/src/main/run/of_michelson.ml b/src/main/run/of_michelson.ml index b8222d44c..4a9b7e1c3 100644 --- a/src/main/run/of_michelson.ml +++ b/src/main/run/of_michelson.ml @@ -97,7 +97,7 @@ let fetch_lambda_types (contract_ty:ex_ty) = | _ -> simple_fail "failed to fetch lambda types" let run_contract ?options (exp:Michelson.t) (exp_type:ex_ty) (input_michelson:Michelson.t) : run_res result = - let open! Tezos_raw_protocol_005_PsBabyM1 in + let open! Tezos_raw_protocol_006_PsCARTHA in let%bind (Ex_ty input_ty, Ex_ty output_ty) = fetch_lambda_types exp_type in let%bind input = Trace.trace_tzresult_lwt (simple_error "error parsing input") @@ @@ -127,7 +127,7 @@ let run_contract ?options (exp:Michelson.t) (exp_type:ex_ty) (input_michelson:Mi | _ -> fail @@ Errors.unknown_failwith_type () ) let run_expression ?options (exp:Michelson.t) (exp_type:ex_ty) : run_res result = - let open! Tezos_raw_protocol_005_PsBabyM1 in + let open! Tezos_raw_protocol_006_PsCARTHA in let (Ex_ty exp_type') = exp_type in let exp = Michelson.strip_annots exp in let top_level = Script_ir_translator.Lambda diff --git a/vendors/ligo-utils/memory-proto-alpha/dune b/vendors/ligo-utils/memory-proto-alpha/dune index 0df6b91ad..207473d50 100644 --- a/vendors/ligo-utils/memory-proto-alpha/dune +++ b/vendors/ligo-utils/memory-proto-alpha/dune @@ -3,6 +3,6 @@ (public_name tezos-memory-proto-alpha) (libraries tezos-protocol-environment - tezos-protocol-005-PsBabyM1 + tezos-protocol-006-PsCARTHA ) ) diff --git a/vendors/ligo-utils/memory-proto-alpha/memory_proto_alpha.ml b/vendors/ligo-utils/memory-proto-alpha/memory_proto_alpha.ml index 2e07e7109..5e2bc88e2 100644 --- a/vendors/ligo-utils/memory-proto-alpha/memory_proto_alpha.ml +++ b/vendors/ligo-utils/memory-proto-alpha/memory_proto_alpha.ml @@ -1,9 +1,9 @@ module Name = struct let name = "alpha" end -module Alpha_environment = Tezos_protocol_005_PsBabyM1.Protocol.Environment +module Alpha_environment = Tezos_protocol_006_PsCARTHA.Protocol.Environment type alpha_error = Alpha_environment.Error_monad.error type 'a alpha_tzresult = 'a Alpha_environment.Error_monad.tzresult module Alpha_error_monad = Alpha_environment.Error_monad -module Proto = Tezos_protocol_005_PsBabyM1 +module Proto = Tezos_protocol_006_PsCARTHA include Proto diff --git a/vendors/ligo-utils/memory-proto-alpha/tezos-memory-proto-alpha.opam b/vendors/ligo-utils/memory-proto-alpha/tezos-memory-proto-alpha.opam index 1ec466604..e6ca037cc 100644 --- a/vendors/ligo-utils/memory-proto-alpha/tezos-memory-proto-alpha.opam +++ b/vendors/ligo-utils/memory-proto-alpha/tezos-memory-proto-alpha.opam @@ -10,7 +10,7 @@ bug-reports: "https://gitlab.com/ligolang/tezos/issues" depends: [ "dune" "tezos-protocol-environment" - "tezos-protocol-005-PsBabyM1" + "tezos-protocol-006-PsCARTHA" ] build: [ ["dune" "build" "-p" name] diff --git a/vendors/ligo-utils/proto-alpha-utils/dune b/vendors/ligo-utils/proto-alpha-utils/dune index 3f8f6b3a1..df6b9a511 100644 --- a/vendors/ligo-utils/proto-alpha-utils/dune +++ b/vendors/ligo-utils/proto-alpha-utils/dune @@ -4,10 +4,10 @@ (libraries tezos-error-monad tezos-stdlib-unix - tezos-protocol-005-PsBabyM1-parameters + tezos-protocol-006-PsCARTHA-parameters tezos-memory-proto-alpha simple-utils tezos-utils ) - (flags (:standard -open Simple_utils )) + (flags (:standard -open Simple_utils)) ) diff --git a/vendors/ligo-utils/proto-alpha-utils/init_proto_alpha.ml b/vendors/ligo-utils/proto-alpha-utils/init_proto_alpha.ml index 8239c6c21..1e0a04566 100644 --- a/vendors/ligo-utils/proto-alpha-utils/init_proto_alpha.ml +++ b/vendors/ligo-utils/proto-alpha-utils/init_proto_alpha.ml @@ -105,7 +105,7 @@ module Context_init = struct Pervasives.failwith "Must have one account with a roll to bake"; (* Check there is at least one roll *) - let constants : Constants_repr.parametric = Tezos_protocol_005_PsBabyM1_parameters.Default_parameters.constants_test in + let constants : Constants_repr.parametric = Tezos_protocol_006_PsCARTHA_parameters.Default_parameters.constants_test in check_constants_consistency constants >>=? fun () -> let hash = diff --git a/vendors/ligo-utils/proto-alpha-utils/proto-alpha-utils.opam b/vendors/ligo-utils/proto-alpha-utils/proto-alpha-utils.opam index e0cf3abfd..d7c1638b6 100644 --- a/vendors/ligo-utils/proto-alpha-utils/proto-alpha-utils.opam +++ b/vendors/ligo-utils/proto-alpha-utils/proto-alpha-utils.opam @@ -41,7 +41,7 @@ depends: [ "tezos-data-encoding" "tezos-protocol-environment" "tezos-protocol-alpha" - "tezos-protocol-005-PsBabyM1-parameters" + "tezos-protocol-006-PsCARTHA" "michelson-parser" "simple-utils" "tezos-utils" diff --git a/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune b/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune index efccb5e51..2db13dc83 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune +++ b/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune @@ -1,22 +1,22 @@ (library - (name tezos_protocol_005_PsBabyM1_parameters) - (public_name tezos-protocol-005-PsBabyM1-parameters) + (name tezos_protocol_006_PsCARTHA_parameters) + (public_name tezos-protocol-006-PsCARTHA-parameters) (modules :standard \ gen) (libraries tezos-base tezos-protocol-environment - tezos-protocol-005-PsBabyM1) + tezos-protocol-006-PsCARTHA) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_005_PsBabyM1 + -open Tezos_protocol_006_PsCARTHA -linkall)) ) (executable (name gen) (libraries tezos-base - tezos-protocol-005-PsBabyM1-parameters) + tezos-protocol-006-PsCARTHA-parameters) (modules gen) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_005_PsBabyM1_parameters + -open Tezos_protocol_006_PsCARTHA_parameters -linkall))) (rule diff --git a/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune-project b/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune-project index 6910ef322..6e6688d7b 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune-project +++ b/vendors/ligo-utils/tezos-protocol-alpha-parameters/dune-project @@ -1,2 +1,2 @@ (lang dune 1.11) -(name tezos-protocol-005-PsBabyM1-parameters) +(name tezos-protocol-006-PsCARTHA-parameters) diff --git a/vendors/ligo-utils/tezos-protocol-alpha-parameters/tezos-protocol-005-PsBabyM1-parameters.opam b/vendors/ligo-utils/tezos-protocol-alpha-parameters/tezos-protocol-006-PsCARTHA-parameters.opam similarity index 73% rename from vendors/ligo-utils/tezos-protocol-alpha-parameters/tezos-protocol-005-PsBabyM1-parameters.opam rename to vendors/ligo-utils/tezos-protocol-alpha-parameters/tezos-protocol-006-PsCARTHA-parameters.opam index 839f7ca54..af4e5f7e0 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha-parameters/tezos-protocol-005-PsBabyM1-parameters.opam +++ b/vendors/ligo-utils/tezos-protocol-alpha-parameters/tezos-protocol-006-PsCARTHA-parameters.opam @@ -8,12 +8,13 @@ license: "MIT" depends: [ "tezos-tooling" { with-test } "ocamlfind" { build } - "dune" { build & >= "1.7" } + "dune" { >= "1.7" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-005-PsBabyM1" + "tezos-protocol-006-PsCARTHA" ] build: [ - [ "dune" "build" "-p" name "-j" jobs ] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] synopsis: "Tezos/Protocol: parameters" diff --git a/vendors/ligo-utils/tezos-protocol-alpha/TEZOS_PROTOCOL b/vendors/ligo-utils/tezos-protocol-alpha/TEZOS_PROTOCOL index 92c00fb26..3154380de 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha/TEZOS_PROTOCOL +++ b/vendors/ligo-utils/tezos-protocol-alpha/TEZOS_PROTOCOL @@ -1,5 +1,5 @@ { - "hash": "PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS", + "hash": "PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb", "modules": [ "Misc", "Storage_description", diff --git a/vendors/ligo-utils/tezos-protocol-alpha/dune-project b/vendors/ligo-utils/tezos-protocol-alpha/dune-project index d4d600dc7..d011e9a22 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha/dune-project +++ b/vendors/ligo-utils/tezos-protocol-alpha/dune-project @@ -1,2 +1,2 @@ (lang dune 1.11) -(name tezos-embedded-protocol-005-PsBabyM1) +(name tezos-embedded-protocol-006-PsCARTHA)