diff --git a/src/bin_client/test/contracts_attic/accounts.tz b/src/bin_client/test/contracts/attic/accounts.tz similarity index 100% rename from src/bin_client/test/contracts_attic/accounts.tz rename to src/bin_client/test/contracts/attic/accounts.tz diff --git a/src/bin_client/test/contracts_attic/add1.tz b/src/bin_client/test/contracts/attic/add1.tz similarity index 100% rename from src/bin_client/test/contracts_attic/add1.tz rename to src/bin_client/test/contracts/attic/add1.tz diff --git a/src/bin_client/test/contracts_attic/add1_list.tz b/src/bin_client/test/contracts/attic/add1_list.tz similarity index 100% rename from src/bin_client/test/contracts_attic/add1_list.tz rename to src/bin_client/test/contracts/attic/add1_list.tz diff --git a/src/bin_client/test/contracts_attic/after_strategy.tz b/src/bin_client/test/contracts/attic/after_strategy.tz similarity index 100% rename from src/bin_client/test/contracts_attic/after_strategy.tz rename to src/bin_client/test/contracts/attic/after_strategy.tz diff --git a/src/bin_client/test/contracts_attic/always.tz b/src/bin_client/test/contracts/attic/always.tz similarity index 100% rename from src/bin_client/test/contracts_attic/always.tz rename to src/bin_client/test/contracts/attic/always.tz diff --git a/src/bin_client/test/contracts_attic/append.tz b/src/bin_client/test/contracts/attic/append.tz similarity index 100% rename from src/bin_client/test/contracts_attic/append.tz rename to src/bin_client/test/contracts/attic/append.tz diff --git a/src/bin_client/test/contracts_attic/at_least.tz b/src/bin_client/test/contracts/attic/at_least.tz similarity index 100% rename from src/bin_client/test/contracts_attic/at_least.tz rename to src/bin_client/test/contracts/attic/at_least.tz diff --git a/src/bin_client/test/contracts_attic/auction.tz b/src/bin_client/test/contracts/attic/auction.tz similarity index 100% rename from src/bin_client/test/contracts_attic/auction.tz rename to src/bin_client/test/contracts/attic/auction.tz diff --git a/src/bin_client/test/contracts_attic/bad_lockup.tz b/src/bin_client/test/contracts/attic/bad_lockup.tz similarity index 100% rename from src/bin_client/test/contracts_attic/bad_lockup.tz rename to src/bin_client/test/contracts/attic/bad_lockup.tz diff --git a/src/bin_client/test/contracts_attic/big_map_union.tz b/src/bin_client/test/contracts/attic/big_map_union.tz similarity index 100% rename from src/bin_client/test/contracts_attic/big_map_union.tz rename to src/bin_client/test/contracts/attic/big_map_union.tz diff --git a/src/bin_client/test/contracts_attic/cadr_annotation.tz b/src/bin_client/test/contracts/attic/cadr_annotation.tz similarity index 100% rename from src/bin_client/test/contracts_attic/cadr_annotation.tz rename to src/bin_client/test/contracts/attic/cadr_annotation.tz diff --git a/src/bin_client/test/contracts_attic/concat.tz b/src/bin_client/test/contracts/attic/concat.tz similarity index 100% rename from src/bin_client/test/contracts_attic/concat.tz rename to src/bin_client/test/contracts/attic/concat.tz diff --git a/src/bin_client/test/contracts_attic/conditionals.tz b/src/bin_client/test/contracts/attic/conditionals.tz similarity index 100% rename from src/bin_client/test/contracts_attic/conditionals.tz rename to src/bin_client/test/contracts/attic/conditionals.tz diff --git a/src/bin_client/test/contracts_attic/cons_twice.tz b/src/bin_client/test/contracts/attic/cons_twice.tz similarity index 100% rename from src/bin_client/test/contracts_attic/cons_twice.tz rename to src/bin_client/test/contracts/attic/cons_twice.tz diff --git a/src/bin_client/test/contracts_attic/cps_fact.tz b/src/bin_client/test/contracts/attic/cps_fact.tz similarity index 100% rename from src/bin_client/test/contracts_attic/cps_fact.tz rename to src/bin_client/test/contracts/attic/cps_fact.tz diff --git a/src/bin_client/test/contracts_attic/create_add1_lists.tz b/src/bin_client/test/contracts/attic/create_add1_lists.tz similarity index 100% rename from src/bin_client/test/contracts_attic/create_add1_lists.tz rename to src/bin_client/test/contracts/attic/create_add1_lists.tz diff --git a/src/bin_client/test/contracts_attic/data_publisher.tz b/src/bin_client/test/contracts/attic/data_publisher.tz similarity index 100% rename from src/bin_client/test/contracts_attic/data_publisher.tz rename to src/bin_client/test/contracts/attic/data_publisher.tz diff --git a/src/bin_client/test/contracts_attic/dispatch.tz b/src/bin_client/test/contracts/attic/dispatch.tz similarity index 100% rename from src/bin_client/test/contracts_attic/dispatch.tz rename to src/bin_client/test/contracts/attic/dispatch.tz diff --git a/src/bin_client/test/contracts_attic/empty.tz b/src/bin_client/test/contracts/attic/empty.tz similarity index 100% rename from src/bin_client/test/contracts_attic/empty.tz rename to src/bin_client/test/contracts/attic/empty.tz diff --git a/src/bin_client/test/contracts_attic/fail.tz b/src/bin_client/test/contracts/attic/fail.tz similarity index 100% rename from src/bin_client/test/contracts_attic/fail.tz rename to src/bin_client/test/contracts/attic/fail.tz diff --git a/src/bin_client/test/contracts_attic/fail_amount.tz b/src/bin_client/test/contracts/attic/fail_amount.tz similarity index 100% rename from src/bin_client/test/contracts_attic/fail_amount.tz rename to src/bin_client/test/contracts/attic/fail_amount.tz diff --git a/src/bin_client/test/contracts_attic/faucet.tz b/src/bin_client/test/contracts/attic/faucet.tz similarity index 100% rename from src/bin_client/test/contracts_attic/faucet.tz rename to src/bin_client/test/contracts/attic/faucet.tz diff --git a/src/bin_client/test/contracts_attic/forward.tz b/src/bin_client/test/contracts/attic/forward.tz similarity index 100% rename from src/bin_client/test/contracts_attic/forward.tz rename to src/bin_client/test/contracts/attic/forward.tz diff --git a/src/bin_client/test/contracts_attic/id.tz b/src/bin_client/test/contracts/attic/id.tz similarity index 100% rename from src/bin_client/test/contracts_attic/id.tz rename to src/bin_client/test/contracts/attic/id.tz diff --git a/src/bin_client/test/contracts_attic/infinite_loop.tz b/src/bin_client/test/contracts/attic/infinite_loop.tz similarity index 100% rename from src/bin_client/test/contracts_attic/infinite_loop.tz rename to src/bin_client/test/contracts/attic/infinite_loop.tz diff --git a/src/bin_client/test/contracts_attic/insertion_sort.tz b/src/bin_client/test/contracts/attic/insertion_sort.tz similarity index 100% rename from src/bin_client/test/contracts_attic/insertion_sort.tz rename to src/bin_client/test/contracts/attic/insertion_sort.tz diff --git a/src/bin_client/test/contracts_attic/int_publisher.tz b/src/bin_client/test/contracts/attic/int_publisher.tz similarity index 100% rename from src/bin_client/test/contracts_attic/int_publisher.tz rename to src/bin_client/test/contracts/attic/int_publisher.tz diff --git a/src/bin_client/test/contracts_attic/king_of_tez.tz b/src/bin_client/test/contracts/attic/king_of_tez.tz similarity index 100% rename from src/bin_client/test/contracts_attic/king_of_tez.tz rename to src/bin_client/test/contracts/attic/king_of_tez.tz diff --git a/src/bin_client/test/contracts_attic/list_map_block.tz b/src/bin_client/test/contracts/attic/list_map_block.tz similarity index 100% rename from src/bin_client/test/contracts_attic/list_map_block.tz rename to src/bin_client/test/contracts/attic/list_map_block.tz diff --git a/src/bin_client/test/contracts_attic/list_of_transactions.tz b/src/bin_client/test/contracts/attic/list_of_transactions.tz similarity index 100% rename from src/bin_client/test/contracts_attic/list_of_transactions.tz rename to src/bin_client/test/contracts/attic/list_of_transactions.tz diff --git a/src/bin_client/test/contracts_attic/loop_left.tz b/src/bin_client/test/contracts/attic/loop_left.tz similarity index 100% rename from src/bin_client/test/contracts_attic/loop_left.tz rename to src/bin_client/test/contracts/attic/loop_left.tz diff --git a/src/bin_client/test/contracts_attic/queue.tz b/src/bin_client/test/contracts/attic/queue.tz similarity index 100% rename from src/bin_client/test/contracts_attic/queue.tz rename to src/bin_client/test/contracts/attic/queue.tz diff --git a/src/bin_client/test/contracts_attic/reduce_map.tz b/src/bin_client/test/contracts/attic/reduce_map.tz similarity index 100% rename from src/bin_client/test/contracts_attic/reduce_map.tz rename to src/bin_client/test/contracts/attic/reduce_map.tz diff --git a/src/bin_client/test/contracts_attic/reentrancy.tz b/src/bin_client/test/contracts/attic/reentrancy.tz similarity index 100% rename from src/bin_client/test/contracts_attic/reentrancy.tz rename to src/bin_client/test/contracts/attic/reentrancy.tz diff --git a/src/bin_client/test/contracts_attic/reverse.tz b/src/bin_client/test/contracts/attic/reverse.tz similarity index 100% rename from src/bin_client/test/contracts_attic/reverse.tz rename to src/bin_client/test/contracts/attic/reverse.tz diff --git a/src/bin_client/test/contracts_attic/spawn_identities.tz b/src/bin_client/test/contracts/attic/spawn_identities.tz similarity index 100% rename from src/bin_client/test/contracts_attic/spawn_identities.tz rename to src/bin_client/test/contracts/attic/spawn_identities.tz diff --git a/src/bin_client/test/contracts_macros/assert.tz b/src/bin_client/test/contracts/macros/assert.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert.tz rename to src/bin_client/test/contracts/macros/assert.tz diff --git a/src/bin_client/test/contracts_macros/assert_cmpeq.tz b/src/bin_client/test/contracts/macros/assert_cmpeq.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_cmpeq.tz rename to src/bin_client/test/contracts/macros/assert_cmpeq.tz diff --git a/src/bin_client/test/contracts_macros/assert_cmpge.tz b/src/bin_client/test/contracts/macros/assert_cmpge.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_cmpge.tz rename to src/bin_client/test/contracts/macros/assert_cmpge.tz diff --git a/src/bin_client/test/contracts_macros/assert_cmpgt.tz b/src/bin_client/test/contracts/macros/assert_cmpgt.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_cmpgt.tz rename to src/bin_client/test/contracts/macros/assert_cmpgt.tz diff --git a/src/bin_client/test/contracts_macros/assert_cmple.tz b/src/bin_client/test/contracts/macros/assert_cmple.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_cmple.tz rename to src/bin_client/test/contracts/macros/assert_cmple.tz diff --git a/src/bin_client/test/contracts_macros/assert_cmplt.tz b/src/bin_client/test/contracts/macros/assert_cmplt.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_cmplt.tz rename to src/bin_client/test/contracts/macros/assert_cmplt.tz diff --git a/src/bin_client/test/contracts_macros/assert_cmpneq.tz b/src/bin_client/test/contracts/macros/assert_cmpneq.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_cmpneq.tz rename to src/bin_client/test/contracts/macros/assert_cmpneq.tz diff --git a/src/bin_client/test/contracts_macros/assert_eq.tz b/src/bin_client/test/contracts/macros/assert_eq.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_eq.tz rename to src/bin_client/test/contracts/macros/assert_eq.tz diff --git a/src/bin_client/test/contracts_macros/assert_ge.tz b/src/bin_client/test/contracts/macros/assert_ge.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_ge.tz rename to src/bin_client/test/contracts/macros/assert_ge.tz diff --git a/src/bin_client/test/contracts_macros/assert_gt.tz b/src/bin_client/test/contracts/macros/assert_gt.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_gt.tz rename to src/bin_client/test/contracts/macros/assert_gt.tz diff --git a/src/bin_client/test/contracts_macros/assert_le.tz b/src/bin_client/test/contracts/macros/assert_le.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_le.tz rename to src/bin_client/test/contracts/macros/assert_le.tz diff --git a/src/bin_client/test/contracts_macros/assert_lt.tz b/src/bin_client/test/contracts/macros/assert_lt.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_lt.tz rename to src/bin_client/test/contracts/macros/assert_lt.tz diff --git a/src/bin_client/test/contracts_macros/assert_neq.tz b/src/bin_client/test/contracts/macros/assert_neq.tz similarity index 100% rename from src/bin_client/test/contracts_macros/assert_neq.tz rename to src/bin_client/test/contracts/macros/assert_neq.tz diff --git a/src/bin_client/test/contracts_macros/big_map_get_add.tz b/src/bin_client/test/contracts/macros/big_map_get_add.tz similarity index 100% rename from src/bin_client/test/contracts_macros/big_map_get_add.tz rename to src/bin_client/test/contracts/macros/big_map_get_add.tz diff --git a/src/bin_client/test/contracts_macros/big_map_mem.tz b/src/bin_client/test/contracts/macros/big_map_mem.tz similarity index 100% rename from src/bin_client/test/contracts_macros/big_map_mem.tz rename to src/bin_client/test/contracts/macros/big_map_mem.tz diff --git a/src/bin_client/test/contracts_macros/build_list.tz b/src/bin_client/test/contracts/macros/build_list.tz similarity index 100% rename from src/bin_client/test/contracts_macros/build_list.tz rename to src/bin_client/test/contracts/macros/build_list.tz diff --git a/src/bin_client/test/contracts_macros/compare.tz b/src/bin_client/test/contracts/macros/compare.tz similarity index 100% rename from src/bin_client/test/contracts_macros/compare.tz rename to src/bin_client/test/contracts/macros/compare.tz diff --git a/src/bin_client/test/contracts_macros/compare_bytes.tz b/src/bin_client/test/contracts/macros/compare_bytes.tz similarity index 100% rename from src/bin_client/test/contracts_macros/compare_bytes.tz rename to src/bin_client/test/contracts/macros/compare_bytes.tz diff --git a/src/bin_client/test/contracts_macros/fail.tz b/src/bin_client/test/contracts/macros/fail.tz similarity index 100% rename from src/bin_client/test/contracts_macros/fail.tz rename to src/bin_client/test/contracts/macros/fail.tz diff --git a/src/bin_client/test/contracts_macros/guestbook.tz b/src/bin_client/test/contracts/macros/guestbook.tz similarity index 100% rename from src/bin_client/test/contracts_macros/guestbook.tz rename to src/bin_client/test/contracts/macros/guestbook.tz diff --git a/src/bin_client/test/contracts_macros/macro_annotations.tz b/src/bin_client/test/contracts/macros/macro_annotations.tz similarity index 100% rename from src/bin_client/test/contracts_macros/macro_annotations.tz rename to src/bin_client/test/contracts/macros/macro_annotations.tz diff --git a/src/bin_client/test/contracts_macros/map_caddaadr.tz b/src/bin_client/test/contracts/macros/map_caddaadr.tz similarity index 100% rename from src/bin_client/test/contracts_macros/map_caddaadr.tz rename to src/bin_client/test/contracts/macros/map_caddaadr.tz diff --git a/src/bin_client/test/contracts_macros/max_in_list.tz b/src/bin_client/test/contracts/macros/max_in_list.tz similarity index 100% rename from src/bin_client/test/contracts_macros/max_in_list.tz rename to src/bin_client/test/contracts/macros/max_in_list.tz diff --git a/src/bin_client/test/contracts_macros/min.tz b/src/bin_client/test/contracts/macros/min.tz similarity index 100% rename from src/bin_client/test/contracts_macros/min.tz rename to src/bin_client/test/contracts/macros/min.tz diff --git a/src/bin_client/test/contracts_macros/pair_macro.tz b/src/bin_client/test/contracts/macros/pair_macro.tz similarity index 100% rename from src/bin_client/test/contracts_macros/pair_macro.tz rename to src/bin_client/test/contracts/macros/pair_macro.tz diff --git a/src/bin_client/test/contracts_macros/set_caddaadr.tz b/src/bin_client/test/contracts/macros/set_caddaadr.tz similarity index 100% rename from src/bin_client/test/contracts_macros/set_caddaadr.tz rename to src/bin_client/test/contracts/macros/set_caddaadr.tz diff --git a/src/bin_client/test/contracts_macros/take_my_money.tz b/src/bin_client/test/contracts/macros/take_my_money.tz similarity index 100% rename from src/bin_client/test/contracts_macros/take_my_money.tz rename to src/bin_client/test/contracts/macros/take_my_money.tz diff --git a/src/bin_client/test/contracts_macros/unpair_macro.tz b/src/bin_client/test/contracts/macros/unpair_macro.tz similarity index 100% rename from src/bin_client/test/contracts_macros/unpair_macro.tz rename to src/bin_client/test/contracts/macros/unpair_macro.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/create_account.tz b/src/bin_client/test/contracts/mini_scenarios/create_account.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/create_account.tz rename to src/bin_client/test/contracts/mini_scenarios/create_account.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/create_contract.tz b/src/bin_client/test/contracts/mini_scenarios/create_contract.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/create_contract.tz rename to src/bin_client/test/contracts/mini_scenarios/create_contract.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/default_account.tz b/src/bin_client/test/contracts/mini_scenarios/default_account.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/default_account.tz rename to src/bin_client/test/contracts/mini_scenarios/default_account.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/hardlimit.tz b/src/bin_client/test/contracts/mini_scenarios/hardlimit.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/hardlimit.tz rename to src/bin_client/test/contracts/mini_scenarios/hardlimit.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/lockup.tz b/src/bin_client/test/contracts/mini_scenarios/lockup.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/lockup.tz rename to src/bin_client/test/contracts/mini_scenarios/lockup.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/originator.tz b/src/bin_client/test/contracts/mini_scenarios/originator.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/originator.tz rename to src/bin_client/test/contracts/mini_scenarios/originator.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/parameterized_multisig.tz b/src/bin_client/test/contracts/mini_scenarios/parameterized_multisig.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/parameterized_multisig.tz rename to src/bin_client/test/contracts/mini_scenarios/parameterized_multisig.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/replay.tz b/src/bin_client/test/contracts/mini_scenarios/replay.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/replay.tz rename to src/bin_client/test/contracts/mini_scenarios/replay.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/reservoir.tz b/src/bin_client/test/contracts/mini_scenarios/reservoir.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/reservoir.tz rename to src/bin_client/test/contracts/mini_scenarios/reservoir.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/reveal_signed_preimage.tz b/src/bin_client/test/contracts/mini_scenarios/reveal_signed_preimage.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/reveal_signed_preimage.tz rename to src/bin_client/test/contracts/mini_scenarios/reveal_signed_preimage.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/scrutable_reservoir.tz b/src/bin_client/test/contracts/mini_scenarios/scrutable_reservoir.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/scrutable_reservoir.tz rename to src/bin_client/test/contracts/mini_scenarios/scrutable_reservoir.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/vote_for_delegate.tz b/src/bin_client/test/contracts/mini_scenarios/vote_for_delegate.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/vote_for_delegate.tz rename to src/bin_client/test/contracts/mini_scenarios/vote_for_delegate.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/weather_insurance.tz b/src/bin_client/test/contracts/mini_scenarios/weather_insurance.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/weather_insurance.tz rename to src/bin_client/test/contracts/mini_scenarios/weather_insurance.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/xcat.tz b/src/bin_client/test/contracts/mini_scenarios/xcat.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/xcat.tz rename to src/bin_client/test/contracts/mini_scenarios/xcat.tz diff --git a/src/bin_client/test/contracts_mini_scenarios/xcat_dapp.tz b/src/bin_client/test/contracts/mini_scenarios/xcat_dapp.tz similarity index 100% rename from src/bin_client/test/contracts_mini_scenarios/xcat_dapp.tz rename to src/bin_client/test/contracts/mini_scenarios/xcat_dapp.tz diff --git a/src/bin_client/test/contracts_opcode/add_delta_timestamp.tz b/src/bin_client/test/contracts/opcodes/add_delta_timestamp.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/add_delta_timestamp.tz rename to src/bin_client/test/contracts/opcodes/add_delta_timestamp.tz diff --git a/src/bin_client/test/contracts_opcode/add_timestamp_delta.tz b/src/bin_client/test/contracts/opcodes/add_timestamp_delta.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/add_timestamp_delta.tz rename to src/bin_client/test/contracts/opcodes/add_timestamp_delta.tz diff --git a/src/bin_client/test/contracts_opcode/and.tz b/src/bin_client/test/contracts/opcodes/and.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/and.tz rename to src/bin_client/test/contracts/opcodes/and.tz diff --git a/src/bin_client/test/contracts_opcode/balance.tz b/src/bin_client/test/contracts/opcodes/balance.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/balance.tz rename to src/bin_client/test/contracts/opcodes/balance.tz diff --git a/src/bin_client/test/contracts_opcode/check_signature.tz b/src/bin_client/test/contracts/opcodes/check_signature.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/check_signature.tz rename to src/bin_client/test/contracts/opcodes/check_signature.tz diff --git a/src/bin_client/test/contracts_opcode/concat_hello.tz b/src/bin_client/test/contracts/opcodes/concat_hello.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/concat_hello.tz rename to src/bin_client/test/contracts/opcodes/concat_hello.tz diff --git a/src/bin_client/test/contracts_opcode/concat_list.tz b/src/bin_client/test/contracts/opcodes/concat_list.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/concat_list.tz rename to src/bin_client/test/contracts/opcodes/concat_list.tz diff --git a/src/bin_client/test/contracts_opcode/contains_all.tz b/src/bin_client/test/contracts/opcodes/contains_all.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/contains_all.tz rename to src/bin_client/test/contracts/opcodes/contains_all.tz diff --git a/src/bin_client/test/contracts_opcode/diff_timestamps.tz b/src/bin_client/test/contracts/opcodes/diff_timestamps.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/diff_timestamps.tz rename to src/bin_client/test/contracts/opcodes/diff_timestamps.tz diff --git a/src/bin_client/test/contracts_opcode/empty_map.tz b/src/bin_client/test/contracts/opcodes/empty_map.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/empty_map.tz rename to src/bin_client/test/contracts/opcodes/empty_map.tz diff --git a/src/bin_client/test/contracts_opcode/exec_concat.tz b/src/bin_client/test/contracts/opcodes/exec_concat.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/exec_concat.tz rename to src/bin_client/test/contracts/opcodes/exec_concat.tz diff --git a/src/bin_client/test/contracts_opcode/first.tz b/src/bin_client/test/contracts/opcodes/first.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/first.tz rename to src/bin_client/test/contracts/opcodes/first.tz diff --git a/src/bin_client/test/contracts_opcode/get_map_value.tz b/src/bin_client/test/contracts/opcodes/get_map_value.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/get_map_value.tz rename to src/bin_client/test/contracts/opcodes/get_map_value.tz diff --git a/src/bin_client/test/contracts_opcode/hash_consistency_checker.tz b/src/bin_client/test/contracts/opcodes/hash_consistency_checker.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/hash_consistency_checker.tz rename to src/bin_client/test/contracts/opcodes/hash_consistency_checker.tz diff --git a/src/bin_client/test/contracts_opcode/hash_key.tz b/src/bin_client/test/contracts/opcodes/hash_key.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/hash_key.tz rename to src/bin_client/test/contracts/opcodes/hash_key.tz diff --git a/src/bin_client/test/contracts_opcode/hash_string.tz b/src/bin_client/test/contracts/opcodes/hash_string.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/hash_string.tz rename to src/bin_client/test/contracts/opcodes/hash_string.tz diff --git a/src/bin_client/test/contracts_opcode/if.tz b/src/bin_client/test/contracts/opcodes/if.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/if.tz rename to src/bin_client/test/contracts/opcodes/if.tz diff --git a/src/bin_client/test/contracts_opcode/if_some.tz b/src/bin_client/test/contracts/opcodes/if_some.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/if_some.tz rename to src/bin_client/test/contracts/opcodes/if_some.tz diff --git a/src/bin_client/test/contracts_opcode/left_right.tz b/src/bin_client/test/contracts/opcodes/left_right.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/left_right.tz rename to src/bin_client/test/contracts/opcodes/left_right.tz diff --git a/src/bin_client/test/contracts_opcode/list_concat.tz b/src/bin_client/test/contracts/opcodes/list_concat.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/list_concat.tz rename to src/bin_client/test/contracts/opcodes/list_concat.tz diff --git a/src/bin_client/test/contracts_opcode/list_concat_bytes.tz b/src/bin_client/test/contracts/opcodes/list_concat_bytes.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/list_concat_bytes.tz rename to src/bin_client/test/contracts/opcodes/list_concat_bytes.tz diff --git a/src/bin_client/test/contracts_opcode/list_id.tz b/src/bin_client/test/contracts/opcodes/list_id.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/list_id.tz rename to src/bin_client/test/contracts/opcodes/list_id.tz diff --git a/src/bin_client/test/contracts_opcode/list_id_map.tz b/src/bin_client/test/contracts/opcodes/list_id_map.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/list_id_map.tz rename to src/bin_client/test/contracts/opcodes/list_id_map.tz diff --git a/src/bin_client/test/contracts_opcode/list_iter.tz b/src/bin_client/test/contracts/opcodes/list_iter.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/list_iter.tz rename to src/bin_client/test/contracts/opcodes/list_iter.tz diff --git a/src/bin_client/test/contracts_opcode/map_car.tz b/src/bin_client/test/contracts/opcodes/map_car.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/map_car.tz rename to src/bin_client/test/contracts/opcodes/map_car.tz diff --git a/src/bin_client/test/contracts_opcode/map_id.tz b/src/bin_client/test/contracts/opcodes/map_id.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/map_id.tz rename to src/bin_client/test/contracts/opcodes/map_id.tz diff --git a/src/bin_client/test/contracts_opcode/map_iter.tz b/src/bin_client/test/contracts/opcodes/map_iter.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/map_iter.tz rename to src/bin_client/test/contracts/opcodes/map_iter.tz diff --git a/src/bin_client/test/contracts_opcode/map_size.tz b/src/bin_client/test/contracts/opcodes/map_size.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/map_size.tz rename to src/bin_client/test/contracts/opcodes/map_size.tz diff --git a/src/bin_client/test/contracts_opcode/noop.tz b/src/bin_client/test/contracts/opcodes/noop.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/noop.tz rename to src/bin_client/test/contracts/opcodes/noop.tz diff --git a/src/bin_client/test/contracts_opcode/not.tz b/src/bin_client/test/contracts/opcodes/not.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/not.tz rename to src/bin_client/test/contracts/opcodes/not.tz diff --git a/src/bin_client/test/contracts_opcode/or.tz b/src/bin_client/test/contracts/opcodes/or.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/or.tz rename to src/bin_client/test/contracts/opcodes/or.tz diff --git a/src/bin_client/test/contracts_opcode/packunpack.tz b/src/bin_client/test/contracts/opcodes/packunpack.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/packunpack.tz rename to src/bin_client/test/contracts/opcodes/packunpack.tz diff --git a/src/bin_client/test/contracts_opcode/pair_id.tz b/src/bin_client/test/contracts/opcodes/pair_id.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/pair_id.tz rename to src/bin_client/test/contracts/opcodes/pair_id.tz diff --git a/src/bin_client/test/contracts_opcode/ret_int.tz b/src/bin_client/test/contracts/opcodes/ret_int.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/ret_int.tz rename to src/bin_client/test/contracts/opcodes/ret_int.tz diff --git a/src/bin_client/test/contracts_opcode/reverse_loop.tz b/src/bin_client/test/contracts/opcodes/reverse_loop.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/reverse_loop.tz rename to src/bin_client/test/contracts/opcodes/reverse_loop.tz diff --git a/src/bin_client/test/contracts_opcode/self.tz b/src/bin_client/test/contracts/opcodes/self.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/self.tz rename to src/bin_client/test/contracts/opcodes/self.tz diff --git a/src/bin_client/test/contracts_opcode/set_car.tz b/src/bin_client/test/contracts/opcodes/set_car.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/set_car.tz rename to src/bin_client/test/contracts/opcodes/set_car.tz diff --git a/src/bin_client/test/contracts_opcode/set_cdr.tz b/src/bin_client/test/contracts/opcodes/set_cdr.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/set_cdr.tz rename to src/bin_client/test/contracts/opcodes/set_cdr.tz diff --git a/src/bin_client/test/contracts_opcode/set_id.tz b/src/bin_client/test/contracts/opcodes/set_id.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/set_id.tz rename to src/bin_client/test/contracts/opcodes/set_id.tz diff --git a/src/bin_client/test/contracts_opcode/set_iter.tz b/src/bin_client/test/contracts/opcodes/set_iter.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/set_iter.tz rename to src/bin_client/test/contracts/opcodes/set_iter.tz diff --git a/src/bin_client/test/contracts_opcode/set_member.tz b/src/bin_client/test/contracts/opcodes/set_member.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/set_member.tz rename to src/bin_client/test/contracts/opcodes/set_member.tz diff --git a/src/bin_client/test/contracts_opcode/set_size.tz b/src/bin_client/test/contracts/opcodes/set_size.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/set_size.tz rename to src/bin_client/test/contracts/opcodes/set_size.tz diff --git a/src/bin_client/test/contracts_opcode/slices.tz b/src/bin_client/test/contracts/opcodes/slices.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/slices.tz rename to src/bin_client/test/contracts/opcodes/slices.tz diff --git a/src/bin_client/test/contracts_opcode/split_bytes.tz b/src/bin_client/test/contracts/opcodes/split_bytes.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/split_bytes.tz rename to src/bin_client/test/contracts/opcodes/split_bytes.tz diff --git a/src/bin_client/test/contracts_opcode/split_string.tz b/src/bin_client/test/contracts/opcodes/split_string.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/split_string.tz rename to src/bin_client/test/contracts/opcodes/split_string.tz diff --git a/src/bin_client/test/contracts_opcode/steps_to_quota.tz b/src/bin_client/test/contracts/opcodes/steps_to_quota.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/steps_to_quota.tz rename to src/bin_client/test/contracts/opcodes/steps_to_quota.tz diff --git a/src/bin_client/test/contracts_opcode/store_input.tz b/src/bin_client/test/contracts/opcodes/store_input.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/store_input.tz rename to src/bin_client/test/contracts/opcodes/store_input.tz diff --git a/src/bin_client/test/contracts_opcode/store_now.tz b/src/bin_client/test/contracts/opcodes/store_now.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/store_now.tz rename to src/bin_client/test/contracts/opcodes/store_now.tz diff --git a/src/bin_client/test/contracts_opcode/str_id.tz b/src/bin_client/test/contracts/opcodes/str_id.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/str_id.tz rename to src/bin_client/test/contracts/opcodes/str_id.tz diff --git a/src/bin_client/test/contracts_opcode/sub_timestamp_delta.tz b/src/bin_client/test/contracts/opcodes/sub_timestamp_delta.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/sub_timestamp_delta.tz rename to src/bin_client/test/contracts/opcodes/sub_timestamp_delta.tz diff --git a/src/bin_client/test/contracts_opcode/subset.tz b/src/bin_client/test/contracts/opcodes/subset.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/subset.tz rename to src/bin_client/test/contracts/opcodes/subset.tz diff --git a/src/bin_client/test/contracts_opcode/tez_add_sub.tz b/src/bin_client/test/contracts/opcodes/tez_add_sub.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/tez_add_sub.tz rename to src/bin_client/test/contracts/opcodes/tez_add_sub.tz diff --git a/src/bin_client/test/contracts_opcode/transfer_amount.tz b/src/bin_client/test/contracts/opcodes/transfer_amount.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/transfer_amount.tz rename to src/bin_client/test/contracts/opcodes/transfer_amount.tz diff --git a/src/bin_client/test/contracts_opcode/transfer_tokens.tz b/src/bin_client/test/contracts/opcodes/transfer_tokens.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/transfer_tokens.tz rename to src/bin_client/test/contracts/opcodes/transfer_tokens.tz diff --git a/src/bin_client/test/contracts_opcode/xor.tz b/src/bin_client/test/contracts/opcodes/xor.tz similarity index 100% rename from src/bin_client/test/contracts_opcode/xor.tz rename to src/bin_client/test/contracts/opcodes/xor.tz diff --git a/src/bin_client/test/dune b/src/bin_client/test/dune index 242cf6a5a..5885a449b 100644 --- a/src/bin_client/test/dune +++ b/src/bin_client/test/dune @@ -5,7 +5,8 @@ king_commitment.json queen_commitment.json test_lib.inc.sh - (glob_files contracts/*)) + (glob_files contracts/opcodes/*) + (glob_files contracts/mini_scenarios/*)) (locks /tcp-port/18731 /tcp-port/19731) (action @@ -35,7 +36,7 @@ (name runtest_contracts_opcode.sh) (deps sandbox.json test_lib.inc.sh - (glob_files contracts_opcode/*)) + (glob_files contracts/opcodes/*)) (locks /tcp-port/18731 /tcp-port/19731) (action @@ -50,7 +51,7 @@ (name runtest_contracts_macros.sh) (deps sandbox.json test_lib.inc.sh - (glob_files contracts_macros/*)) + (glob_files contracts/macros/*)) (locks /tcp-port/18731 /tcp-port/19731) (action @@ -65,7 +66,7 @@ (name runtest_contracts_mini_scenarios.sh) (deps sandbox.json test_lib.inc.sh - (glob_files contracts_mini_scenarios/*)) + (glob_files contracts/mini_scenarios/*)) (locks /tcp-port/18731 /tcp-port/19731) (action @@ -80,7 +81,7 @@ (name runtest_contracts_attic.sh) (deps sandbox.json test_lib.inc.sh - (glob_files contracts_attic/*)) + (glob_files contracts/attic/*)) (locks /tcp-port/18731 /tcp-port/19731) (action diff --git a/src/bin_client/test/test_basic.sh b/src/bin_client/test/test_basic.sh index c0240ed34..130c13eac 100755 --- a/src/bin_client/test/test_basic.sh +++ b/src/bin_client/test/test_basic.sh @@ -59,18 +59,18 @@ $client get balance for $key2 | assert "2000 ęś©" bake -$client remember script noop file:contracts_opcode/noop.tz -$client typecheck script file:contracts_opcode/noop.tz +$client remember script noop file:contracts/opcodes/noop.tz +$client typecheck script file:contracts/opcodes/noop.tz bake_after $client originate contract noop \ for $key1 transferring 1,000 from bootstrap1 \ - running file:contracts_opcode/noop.tz + running file:contracts/opcodes/noop.tz bake_after $client transfer 10 from bootstrap1 to noop -arg "Unit" bake_after $client originate contract hardlimit \ for $key1 transferring 1,000 from bootstrap1 \ - running file:contracts_mini_scenarios/hardlimit.tz -init "3" + running file:contracts/mini_scenarios/hardlimit.tz -init "3" bake_after $client transfer 10 from bootstrap1 to hardlimit -arg "Unit" bake_after $client transfer 10 from bootstrap1 to hardlimit -arg "Unit" diff --git a/src/bin_client/test/test_lib.inc.sh b/src/bin_client/test/test_lib.inc.sh index c552a6fb4..bd560111b 100755 --- a/src/bin_client/test/test_lib.inc.sh +++ b/src/bin_client/test/test_lib.inc.sh @@ -17,10 +17,10 @@ local_admin_client="${5:-$test_dir/../../../_build/default/src/bin_client/main_a local_compiler="${6:-$test_dir/../../../_build/default/src/lib_protocol_compiler/main_native.exe}" contract_dir="contracts" -contract_op_dir="contracts_opcode" -contract_macros_dir="contracts_macros" -contract_scenarios_dir="contracts_mini_scenarios" -contract_attic_dir="contracts_attic" +contract_op_dir="contracts/opcodes" +contract_macros_dir="contracts/macros" +contract_scenarios_dir="contracts/mini_scenarios" +contract_attic_dir="contracts/attic" source $tezos_sandboxed_node source $tezos_init_sandboxed_client