Merge branch 'feature/dry-run-bin' into 'dev'

Feature/dry run bin

See merge request ligolang/ligo!24
This commit is contained in:
Matej Šima 2019-06-10 17:04:45 +00:00
commit 835cc785dc
2 changed files with 32 additions and 9 deletions

View File

@ -41,28 +41,28 @@ let main =
let term = Term.(const print_endline $ const "Ligo needs a command. Do ligo --help") in let term = Term.(const print_endline $ const "Ligo needs a command. Do ligo --help") in
(term , Term.info "ligo") (term , Term.info "ligo")
let source = let source n =
let open Arg in let open Arg in
let info = let info =
let docv = "SOURCE_FILE" in let docv = "SOURCE_FILE" in
let doc = "$(docv) is the path to the .ligo file of the contract." in let doc = "$(docv) is the path to the .ligo file of the contract." in
info ~docv ~doc [] in info ~docv ~doc [] in
required @@ pos 0 (some string) None info required @@ pos n (some string) None info
let entry_point = let entry_point n =
let open Arg in let open Arg in
let info = let info =
let docv = "ENTRY_POINT" in let docv = "ENTRY_POINT" in
let doc = "$(docv) is entry-point that will be compiled." in let doc = "$(docv) is entry-point that will be compiled." in
info ~docv ~doc [] in info ~docv ~doc [] in
required @@ pos 1 (some string) (Some "main") info required @@ pos n (some string) (Some "main") info
let expression = let expression n =
let open Arg in let open Arg in
let docv = "EXPRESSION" in let docv = "EXPRESSION" in
let doc = "$(docv) is the expression that will be compiled." in let doc = "$(docv) is the expression that will be compiled." in
let info = info ~docv ~doc [] in let info = info ~docv ~doc [] in
required @@ pos 2 (some string) None info required @@ pos n (some string) None info
let syntax = let syntax =
let open Arg in let open Arg in
@ -82,7 +82,7 @@ let compile_file =
ok () ok ()
in in
let term = let term =
Term.(const f $ source $ entry_point $ syntax) in Term.(const f $ source 0 $ entry_point 1 $ syntax) in
let cmdname = "compile-contract" in let cmdname = "compile-contract" in
let docs = "Subcommand: compile a contract. See `ligo " ^ cmdname ^ " --help' for a list of options specific to this subcommand." in let docs = "Subcommand: compile a contract. See `ligo " ^ cmdname ^ " --help' for a list of options specific to this subcommand." in
(term , Term.info ~docs cmdname) (term , Term.info ~docs cmdname)
@ -97,7 +97,7 @@ let compile_parameter =
ok () ok ()
in in
let term = let term =
Term.(const f $ source $ entry_point $ expression $ syntax) in Term.(const f $ source 0 $ entry_point 1 $ expression 2 $ syntax) in
let cmdname = "compile-parameter" in let cmdname = "compile-parameter" in
let docs = "Subcommand: compile parameters to a michelson expression. The resulting michelson expression can be passed as an argument in a transaction which calls a contract. See `ligo " ^ cmdname ^ " --help' for a list of options specific to this subcommand." in let docs = "Subcommand: compile parameters to a michelson expression. The resulting michelson expression can be passed as an argument in a transaction which calls a contract. See `ligo " ^ cmdname ^ " --help' for a list of options specific to this subcommand." in
(term , Term.info ~docs cmdname) (term , Term.info ~docs cmdname)
@ -112,10 +112,23 @@ let compile_storage =
ok () ok ()
in in
let term = let term =
Term.(const f $ source $ entry_point $ expression $ syntax) in Term.(const f $ source 0 $ entry_point 1 $ expression 2 $ syntax) in
let cmdname = "compile-storage" in let cmdname = "compile-storage" in
let docs = "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. See `ligo " ^ cmdname ^ " --help' for a list of options specific to this subcommand." in let docs = "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. See `ligo " ^ cmdname ^ " --help' for a list of options specific to this subcommand." in
(term , Term.info ~docs cmdname) (term , Term.info ~docs cmdname)
let dry_run =
let f source entry_point storage input syntax =
toplevel @@
let%bind output =
Ligo.Run.run_contract source entry_point storage input syntax in
Format.printf "%a\n" Ast_simplified.PP.expression output ;
ok ()
in
let term =
Term.(const f $ source 0 $ entry_point 1 $ expression 2 $ expression 3 $ syntax) in
let cmdname = "dry-run" in
let docs = "Subcommand: run a smart-contract with the given storage and input." in
(term , Term.info ~docs cmdname)
let () = Term.exit @@ Term.eval_choice main [compile_file ; compile_parameter ; compile_storage] let () = Term.exit @@ Term.eval_choice main [compile_file ; compile_parameter ; compile_storage]

View File

@ -216,3 +216,13 @@ let type_file ?(debug_simplify = false) ?(debug_typed = false)
Format.(printf "Typed : %a\n%!" Ast_typed.PP.program typed) Format.(printf "Typed : %a\n%!" Ast_typed.PP.program typed)
)) ; )) ;
ok typed ok typed
let run_contract source entry_point storage input syntax =
let%bind typed =
type_file source entry_point in
let%bind storage_simpl =
parsify_expression storage syntax in
let%bind input_simpl =
parsify_expression input syntax in
Run_simplified.run_simplityped typed entry_point (Ast_simplified.e_pair storage_simpl input_simpl)