Verified Commit e8fd44dc authored by Bruno B's avatar Bruno B Committed by Benjamin Canou
Browse files

Client: reorg Michelson contracts + update bash scripts

parent ff468aac
......@@ -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
......
......@@ -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"
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment