carthage update:

* update dune & opam files
* update modules in source
This commit is contained in:
Lesenechal Remi 2020-02-13 14:09:45 +01:00
parent 395b4890eb
commit e63f2407c2
12 changed files with 23 additions and 22 deletions

View File

@ -97,7 +97,7 @@ let fetch_lambda_types (contract_ty:ex_ty) =
| _ -> simple_fail "failed to fetch lambda types" | _ -> 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 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 (Ex_ty input_ty, Ex_ty output_ty) = fetch_lambda_types exp_type in
let%bind input = let%bind input =
Trace.trace_tzresult_lwt (simple_error "error parsing 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 () ) | _ -> fail @@ Errors.unknown_failwith_type () )
let run_expression ?options (exp:Michelson.t) (exp_type:ex_ty) : run_res result = 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 (Ex_ty exp_type') = exp_type in
let exp = Michelson.strip_annots exp in let exp = Michelson.strip_annots exp in
let top_level = Script_ir_translator.Lambda let top_level = Script_ir_translator.Lambda

View File

@ -3,6 +3,6 @@
(public_name tezos-memory-proto-alpha) (public_name tezos-memory-proto-alpha)
(libraries (libraries
tezos-protocol-environment tezos-protocol-environment
tezos-protocol-005-PsBabyM1 tezos-protocol-006-PsCARTHA
) )
) )

View File

@ -1,9 +1,9 @@
module Name = struct let name = "alpha" end 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 alpha_error = Alpha_environment.Error_monad.error
type 'a alpha_tzresult = 'a Alpha_environment.Error_monad.tzresult type 'a alpha_tzresult = 'a Alpha_environment.Error_monad.tzresult
module Alpha_error_monad = Alpha_environment.Error_monad module Alpha_error_monad = Alpha_environment.Error_monad
module Proto = Tezos_protocol_005_PsBabyM1 module Proto = Tezos_protocol_006_PsCARTHA
include Proto include Proto

View File

@ -10,7 +10,7 @@ bug-reports: "https://gitlab.com/ligolang/tezos/issues"
depends: [ depends: [
"dune" "dune"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-005-PsBabyM1" "tezos-protocol-006-PsCARTHA"
] ]
build: [ build: [
["dune" "build" "-p" name] ["dune" "build" "-p" name]

View File

@ -4,10 +4,10 @@
(libraries (libraries
tezos-error-monad tezos-error-monad
tezos-stdlib-unix tezos-stdlib-unix
tezos-protocol-005-PsBabyM1-parameters tezos-protocol-006-PsCARTHA-parameters
tezos-memory-proto-alpha tezos-memory-proto-alpha
simple-utils simple-utils
tezos-utils tezos-utils
) )
(flags (:standard -open Simple_utils )) (flags (:standard -open Simple_utils))
) )

View File

@ -105,7 +105,7 @@ module Context_init = struct
Pervasives.failwith "Must have one account with a roll to bake"; Pervasives.failwith "Must have one account with a roll to bake";
(* Check there is at least one roll *) (* 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 () -> check_constants_consistency constants >>=? fun () ->
let hash = let hash =

View File

@ -41,7 +41,7 @@ depends: [
"tezos-data-encoding" "tezos-data-encoding"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
"tezos-protocol-005-PsBabyM1-parameters" "tezos-protocol-006-PsCARTHA"
"michelson-parser" "michelson-parser"
"simple-utils" "simple-utils"
"tezos-utils" "tezos-utils"

View File

@ -1,22 +1,22 @@
(library (library
(name tezos_protocol_005_PsBabyM1_parameters) (name tezos_protocol_006_PsCARTHA_parameters)
(public_name tezos-protocol-005-PsBabyM1-parameters) (public_name tezos-protocol-006-PsCARTHA-parameters)
(modules :standard \ gen) (modules :standard \ gen)
(libraries tezos-base (libraries tezos-base
tezos-protocol-environment tezos-protocol-environment
tezos-protocol-005-PsBabyM1) tezos-protocol-006-PsCARTHA)
(flags (:standard -open Tezos_base__TzPervasives (flags (:standard -open Tezos_base__TzPervasives
-open Tezos_protocol_005_PsBabyM1 -open Tezos_protocol_006_PsCARTHA
-linkall)) -linkall))
) )
(executable (executable
(name gen) (name gen)
(libraries tezos-base (libraries tezos-base
tezos-protocol-005-PsBabyM1-parameters) tezos-protocol-006-PsCARTHA-parameters)
(modules gen) (modules gen)
(flags (:standard -open Tezos_base__TzPervasives (flags (:standard -open Tezos_base__TzPervasives
-open Tezos_protocol_005_PsBabyM1_parameters -open Tezos_protocol_006_PsCARTHA_parameters
-linkall))) -linkall)))
(rule (rule

View File

@ -1,2 +1,2 @@
(lang dune 1.11) (lang dune 1.11)
(name tezos-protocol-005-PsBabyM1-parameters) (name tezos-protocol-006-PsCARTHA-parameters)

View File

@ -8,12 +8,13 @@ license: "MIT"
depends: [ depends: [
"tezos-tooling" { with-test } "tezos-tooling" { with-test }
"ocamlfind" { build } "ocamlfind" { build }
"dune" { build & >= "1.7" } "dune" { >= "1.7" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-005-PsBabyM1" "tezos-protocol-006-PsCARTHA"
] ]
build: [ 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" synopsis: "Tezos/Protocol: parameters"

View File

@ -1,5 +1,5 @@
{ {
"hash": "PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS", "hash": "PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb",
"modules": [ "modules": [
"Misc", "Misc",
"Storage_description", "Storage_description",

View File

@ -1,2 +1,2 @@
(lang dune 1.11) (lang dune 1.11)
(name tezos-embedded-protocol-005-PsBabyM1) (name tezos-embedded-protocol-006-PsCARTHA)