Change tezos-client command line

OCamlPro · Jul 6, 2018 · 76ea464 · 76ea464
1 parent 367c761
commit 76ea464
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/check-mini.sh b/check-mini.sh
@@ -13,7 +13,7 @@ LIQUIDITY=liquidity
 ./_obuild/${LIQUIDITY}-mini/${LIQUIDITY}-mini.asm tests/$test.liq || exit 2
 
 if [ -f ${TEZOS_FULL_PATH} ] ; then
-    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck program tests/$test.liq.tz
+    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck script tests/$test.liq.tz
 else
     echo "\n${RED}${TEZOS_FULL_PATH} not present ! typechecking of tests/$test.liq.tz skipped${DEFAULT}\n"
 fi
@@ -23,7 +23,7 @@ fi
 ./_obuild/${LIQUIDITY}-mini/${LIQUIDITY}-mini.asm tests/$test.liq.tz.liq || exit 2
 
 if [ -f ${TEZOS_FULL_PATH} ] ; then
-    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck program tests/$test.liq.tz.liq.tz
+    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck script tests/$test.liq.tz.liq.tz
 else
     echo "\n${RED}${TEZOS_FULL_PATH} not present ! typechecking of tests/$test.liq.tz.liq.tz skipped${DEFAULT}\n"
 fi
diff --git a/check-rev.sh b/check-rev.sh
@@ -15,7 +15,7 @@ echo "\n[check-rev.sh] test = $test, TESTDIR = $TESTDIR"
 
 if [ -f ${TEZOS_FULL_PATH} ] ; then
     echo "Testing $test.tz ---------------------------------------------"
-    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck program $TESTDIR/$test.tz
+    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck script $TESTDIR/$test.tz
 else
     echo "\n${RED}${TEZOS_FULL_PATH} not present ! typechecking of $TESTDIR/$test.tz skipped${DEFAULT}\n"
 fi
@@ -28,7 +28,7 @@ echo "Compiling $test.tz.liq ---------------------------------------"
 
 if [ -f ${TEZOS_FULL_PATH} ] ; then
     echo "Testing $test.tz.liq.tz --------------------------------------"
-    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck program $TESTDIR/$test.tz.liq.tz || exit 2
+    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck script $TESTDIR/$test.tz.liq.tz || exit 2
 else
     echo "\n${RED}${TEZOS_FULL_PATH} not present ! typechecking of $TESTDIR/$test.tz.liq.tz skipped${DEFAULT}\n"
 fi

diff --git a/check.sh b/check.sh
@@ -17,7 +17,7 @@ echo ${LIQEXEC} tests/$test.liq
 ${LIQEXEC} tests/$test.liq || exit 2
 
 if [ -f ${TEZOS_FULL_PATH} ] ; then
-    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck program tests/$test.liq.tz || exit 2
+    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck script tests/$test.liq.tz || exit 2
 else
     echo "\n${RED}${TEZOS_FULL_PATH} not present ! typechecking of tests/$test.liq.tz skipped${DEFAULT}\n"
 fi
@@ -29,7 +29,7 @@ echo ${LIQEXEC} tests/$test.liq.tz.liq
 ${LIQEXEC} tests/$test.liq.tz.liq || exit 2
 
 if [ -f ${TEZOS_FULL_PATH} ] ; then
-    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck program tests/$test.liq.tz.liq.tz || exit 2
+    ${TEZOS_FULL_PATH} ${TEZOS_ARGS} typecheck script tests/$test.liq.tz.liq.tz || exit 2
 else
     echo "\n${RED}${TEZOS_FULL_PATH} not present ! typechecking of tests/$test.liq.tz.liq.tz skipped${DEFAULT}\n"
 fi

diff --git a/tests/test19.liq b/tests/test19.liq
@@ -13,8 +13,8 @@ let%entry main
     Current.failwith ();
   if key_hash =
     Crypto.hash_key edpkuTXkJDGcFd5nh6VvMz8phXxU3Bi7h6hqgywNFi1vZTfQNnS1RV then
-    Current.faiwithl ();
-  let delegate = Contract.manager (Current.source ()) in
+    Current.failwith ();
+  let delegate = Contract.sender () in
   let spendable = Crypto.check storage.key parameter storage.hash in
   let amount = Current.amount () in
   let amount = match amount / 2p with

diff --git a/tools/liquidity/liquidMain.ml b/tools/liquidity/liquidMain.ml
@@ -90,7 +90,7 @@ let compile_liquid_file filename =
   FileString.write_file output s;
   Printf.eprintf "File %S generated\n%!" output;
   Printf.eprintf "If tezos is compiled, you may want to typecheck with:\n";
-  Printf.eprintf "  tezos-client typecheck program %s\n" output
+  Printf.eprintf "  tezos-client typecheck script %s\n" output
 
 
 let compile_tezos_file filename =