From 87be7df58429d0fd147ce11f00f1474ff2945533 Mon Sep 17 00:00:00 2001 From: b Date: Fri, 9 Nov 2018 11:49:56 +0100 Subject: [PATCH] Client: rm attic/fail.tz (duplicate from macros/fail.tz) & improve TODO messages --- src/bin_client/test/contracts/attic/fail.tz | 5 ---- src/bin_client/test/test_contracts_attic.sh | 28 +++++++------------ src/bin_client/test/test_contracts_macros.sh | 2 +- .../test/test_contracts_mini_scenarios.sh | 6 ++-- src/bin_client/test/test_contracts_opcode.sh | 3 ++ 5 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 src/bin_client/test/contracts/attic/fail.tz diff --git a/src/bin_client/test/contracts/attic/fail.tz b/src/bin_client/test/contracts/attic/fail.tz deleted file mode 100644 index 7f8bde252..000000000 --- a/src/bin_client/test/contracts/attic/fail.tz +++ /dev/null @@ -1,5 +0,0 @@ -parameter unit; -storage unit; -code - { # This contract will never accept a incoming transaction - FAIL}; diff --git a/src/bin_client/test/test_contracts_attic.sh b/src/bin_client/test/test_contracts_attic.sh index 03a0ae754..a3697b03f 100644 --- a/src/bin_client/test/test_contracts_attic.sh +++ b/src/bin_client/test/test_contracts_attic.sh @@ -44,24 +44,16 @@ assert_storage $contract_attic_dir/reverse.tz '{""}' '{ "c" ; "b" ; "a" }' '{ "a assert_storage $contract_attic_dir/loop_left.tz '{""}' '{}' '{}' assert_storage $contract_attic_dir/loop_left.tz '{""}' '{ "c" ; "b" ; "a" }' '{ "a" ; "b" ; "c" }' - -# TODO [a-k] contracts in attic - -# List of transactions -# TODO - - -# Queue -# TODO - -# Reduce map -# TODO - -# Reentrancy -# TODO - -# Spawn identities -# TODO +# TODO add tests for +# accounts.tz, add1_list.tz, add1.tz, after_strategy.tz, always.tz, +# append.tz, at_least.tz, auction.tz, bad_lockup.tz, +# big_map_union.tz, cadr_annotation.tz, concat.tz, conditionals.tz, +# cons_twice.tz, cps_fact.tz, create_add1_lists.tz, +# data_publisher.tz, dispatch.tz, empty.tz, fail_amount.tz, +# faucet.tz, forward.tz, id.tz, infinite_loop.tz, +# insertion_sort.tz, int_publisher.tz, king_of_tez.tz, +# list_of_transactions.tz, queue.tz, reduce_map.tz, reentrancy.tz, +# spawn_identities.tz printf "\nEnd of test\n" diff --git a/src/bin_client/test/test_contracts_macros.sh b/src/bin_client/test/test_contracts_macros.sh index b6960d79f..6fdf65525 100644 --- a/src/bin_client/test/test_contracts_macros.sh +++ b/src/bin_client/test/test_contracts_macros.sh @@ -30,7 +30,7 @@ if [ ! $NO_TYPECHECK ] ; then printf "All contracts are well typed\n\n" fi -# TODO macro_annotations.tz, min.tz, pair_macro.tz, take_my_money.tz, unpair_macro.tz +# TODO add tests for fail.tz, macro_annotations.tz, min.tz, pair_macro.tz, take_my_money.tz, unpair_macro.tz # FORMAT: assert_output contract_file storage input expected_result diff --git a/src/bin_client/test/test_contracts_mini_scenarios.sh b/src/bin_client/test/test_contracts_mini_scenarios.sh index 771dd2f3b..e62154733 100644 --- a/src/bin_client/test/test_contracts_mini_scenarios.sh +++ b/src/bin_client/test/test_contracts_mini_scenarios.sh @@ -32,8 +32,10 @@ fi # FORMAT: assert_output contract_file storage input expected_result -# TODO lockup, originator, parameterized_multisig, reservoir, scrutable_reservoir, -# TODO weather_insurance, xcat_dapp, xcat +# TODO add tests for the following contracts +# lockup, originator, parameterized_multisig, reservoir, scrutable_reservoir, +# weather_insurance, xcat_dapp, xcat +# NB: hardlimit.tz is tested in test_basic.sh # Test replay prevention init_with_transfer $contract_scenarios_dir/replay.tz $key2 Unit 0 bootstrap1 diff --git a/src/bin_client/test/test_contracts_opcode.sh b/src/bin_client/test/test_contracts_opcode.sh index 4a1d58f6b..4e88b4321 100644 --- a/src/bin_client/test/test_contracts_opcode.sh +++ b/src/bin_client/test/test_contracts_opcode.sh @@ -32,6 +32,9 @@ fi # FORMAT: assert_output contract_file storage input expected_result +# TODO add tests for map_car.tz, subset.tz +# NB: noop.tz is tested in test_basic.sh + assert_storage $contract_op_dir/ret_int.tz None Unit '(Some 300)'