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

Merge branch 'typechecking-gas' into 'dev'

Browse Source 
More gas for typechecking etc

Closes #162

See merge request ligolang/ligo!479
This commit is contained in:
Rémi Lesenechal 2020-03-05 15:38:09 +00:00
commit cc83aa1367
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendors/ligo-utils/proto-alpha-utils/init_proto_alpha.ml vendored
View File

@ -200,7 +200,7 @@ type environment = {
let init_environment () = let init_environment () =
Context_init.main 10 >>=? fun (tezos_context, accounts, contracts) -> Context_init.main 10 >>=? fun (tezos_context, accounts, contracts) ->
let accounts = List.map fst accounts in let accounts = List.map fst accounts in
let tezos_context = Alpha_context.Gas.set_limit tezos_context @@ Z.of_int 350000 in let tezos_context = Alpha_context.Gas.set_limit tezos_context @@ Z.of_int 800000 in
let identities = let identities =
List.map (fun ((a:Context_init.account), c) -> { List.map (fun ((a:Context_init.account), c) -> {
public_key = a.pk ; public_key = a.pk ;

3
vendors/ligo-utils/proto-alpha-utils/x_memory_proto_alpha.ml vendored
View File

@ -1111,7 +1111,8 @@ type typecheck_res =
let typecheck_contract contract = let typecheck_contract contract =
let contract' = Tezos_micheline.Micheline.strip_locations contract in let contract' = Tezos_micheline.Micheline.strip_locations contract in
Script_ir_translator.typecheck_code dummy_environment.tezos_context contract' >>= fun x -> let ctxt = Raw_context.set_gas_unlimited dummy_environment.tezos_context in
Script_ir_translator.typecheck_code ctxt contract' >>= fun x ->
match x with match x with
| Ok _res -> return Type_checked | Ok _res -> return Type_checked
| Error (Script_tc_errors.Ill_formed_type (Some "parameter", _code, _)::_) -> return Err_parameter | Error (Script_tc_errors.Ill_formed_type (Some "parameter", _code, _)::_) -> return Err_parameter