From f89f541b02d23cd2e4a7ba5fda132dc7de37a207 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Fri, 4 Jan 2019 12:47:36 -0500 Subject: [PATCH 1/3] Gid rid of some tabs --- src/bin_client/tezos-init-sandboxed-client.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin_client/tezos-init-sandboxed-client.sh b/src/bin_client/tezos-init-sandboxed-client.sh index a663d285d03e..f7c18c954549 100755 --- a/src/bin_client/tezos-init-sandboxed-client.sh +++ b/src/bin_client/tezos-init-sandboxed-client.sh @@ -161,7 +161,7 @@ activate_alpha() { activate protocol ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK \ with fitness 1 \ and key activator \ - and parameters "${parameters_file}" \ + and parameters "${parameters_file}" \ --timestamp $(TZ='AAA+1' date +%FT%TZ) } @@ -182,7 +182,7 @@ main () { parameters_file="${parameters_file:-$bin_dir/../../scripts/protocol_parameters.json}" local_compiler="${local_compiler:-$bin_dir/../../_build/default/src/lib_protocol_compiler/main_native.exe}" else - # we assume a clean install with tezos-(admin-)client in the path + # we assume a clean install with tezos-(admin-)client in the path local_client="${local_client:-$(which tezos-client)}" local_admin_client="${local_admin_client:-$(which tezos-admin-client)}" local_signer="${local_signer:-$(which tezos-signer)}" @@ -216,12 +216,12 @@ main () { if [ -n "$USE_TLS" ]; then baker="$local_baker -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - endorser="$local_endorser -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - accuser="$local_accuser -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" + endorser="$local_endorser -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" + accuser="$local_accuser -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" else baker="$local_baker -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - endorser="$local_endorser -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - accuser="$local_accuser -base-dir $client_dir -addr 127.0.0.1 -port $rpc" + endorser="$local_endorser -base-dir $client_dir -addr 127.0.0.1 -port $rpc" + accuser="$local_accuser -base-dir $client_dir -addr 127.0.0.1 -port $rpc" fi echo '#!/bin/sh' > $client_dir/bin/tezos-baker-$protocol -- GitLab From 3817dc82fb0d3d5192d222b8b7094f33940a947a Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Fri, 4 Jan 2019 12:53:46 -0500 Subject: [PATCH 2/3] Make bin_client test scripts flexible enough to run tests with ledger --- src/bin_client/test/test_lib.inc.sh | 21 +-- src/bin_client/test/test_voting.sh | 15 +- src/bin_client/tezos-init-sandboxed-client.sh | 132 ++++++++++-------- 3 files changed, 90 insertions(+), 78 deletions(-) diff --git a/src/bin_client/test/test_lib.inc.sh b/src/bin_client/test/test_lib.inc.sh index 7ba2b861645c..c0b2f94d2722 100755 --- a/src/bin_client/test/test_lib.inc.sh +++ b/src/bin_client/test/test_lib.inc.sh @@ -4,17 +4,18 @@ test_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && echo "$(pwd -P)")" src_dir="$(dirname "$test_dir")" cd "$test_dir" -sandbox_file="$test_dir/sandbox.json" -parameters_file="$test_dir/protocol_parameters.json" +: "${log_dir:=$test_dir}" +: "${sandbox_file:=$test_dir/sandbox.json}" +: "${parameters_file:=$test_dir/protocol_parameters.json}" export TEZOS_CLIENT_UNSAFE_DISABLE_DISCLAIMER=Y -tezos_sandboxed_node="${1:-$test_dir/../../bin_node/tezos-sandboxed-node.sh}" -local_node="${2:-$test_dir/../../../_build/default/src/bin_node/main.exe}" -tezos_init_sandboxed_client="${3:-$test_dir/../../bin_client/tezos-init-sandboxed-client.sh}" -local_client="${4:-$test_dir/../../../_build/default/src/bin_client/main_client.exe}" -local_admin_client="${5:-$test_dir/../../../_build/default/src/bin_client/main_admin.exe}" -local_compiler="${6:-$test_dir/../../../_build/default/src/lib_protocol_compiler/main_native.exe}" +tezos_sandboxed_node="${1:-${tezos_sandboxed_node:-$test_dir/../../bin_node/tezos-sandboxed-node.sh}}" +local_node="${2:-${local_node:-$test_dir/../../../_build/default/src/bin_node/main.exe}}" +tezos_init_sandboxed_client="${3:-${tezos_init_sandboxed_client:-$test_dir/../../bin_client/tezos-init-sandboxed-client.sh}}" +local_client="${4:-${local_client:-$test_dir/../../../_build/default/src/bin_client/main_client.exe}}" +local_admin_client="${5:-${local_admin_client:-$test_dir/../../../_build/default/src/bin_client/main_admin.exe}}" +local_compiler="${6:-${local_compiler:-$test_dir/../../../_build/default/src/lib_protocol_compiler/main_native.exe}}" contract_op_dir="contracts/opcodes" contract_macros_dir="contracts/macros" @@ -60,8 +61,8 @@ admin_client_instances=() start_node() { local id=${1:-1} shift - start_sandboxed_node $id "$@" > LOG.$id 2>&1 - register_log LOG.$id + start_sandboxed_node $id "$@" > "$log_dir/LOG.$id" 2>&1 + register_log "$log_dir/LOG.$id" init_sandboxed_client $id wait_for_the_node_to_be_ready add_sandboxed_bootstrap_identities diff --git a/src/bin_client/test/test_voting.sh b/src/bin_client/test/test_voting.sh index 55fe7df9b25a..9276f59de2c9 100755 --- a/src/bin_client/test/test_voting.sh +++ b/src/bin_client/test/test_voting.sh @@ -1,18 +1,21 @@ -#!/bin/bash +#!/usr/bin/env bash # Requires jq command -set -e -set -o pipefail +set -eo pipefail test_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)")" + source $test_dir/test_lib.inc.sh "$@" # Prepare a config with a shorter blocks_per_voting_period tempdir=`mktemp -d` -sed -e 's/"blocks_per_voting_period" : [0-9]*/"blocks_per_voting_period" : 4/' $parameters_file > $tempdir/parameters.json -parameters_file=$tempdir/parameters.json -echo params=${parameters_file} +export parameters_file="$tempdir/parameters.json" +get_protocol_parameters_default \ + | jq '.blocks_per_voting_period = 4 | .blocks_per_cycle = 128 | .blocks_per_roll_snapshot = 32' \ + > "$parameters_file" +echo "params=${parameters_file}" + # Start a node start_node 1 diff --git a/src/bin_client/tezos-init-sandboxed-client.sh b/src/bin_client/tezos-init-sandboxed-client.sh index f7c18c954549..05bfac6bb4dd 100755 --- a/src/bin_client/tezos-init-sandboxed-client.sh +++ b/src/bin_client/tezos-init-sandboxed-client.sh @@ -1,49 +1,47 @@ -#! /usr/bin/env bash +#!/usr/bin/env bash set -e client_dirs=() -init_sandboxed_client() { +# key pairs from $src_dir/test/parameters.json - id="$1" - shift 1 +: "${BOOTSTRAP1_IDENTITY:=tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx}" +: "${BOOTSTRAP1_PUBLIC:=edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav}" +: "${BOOTSTRAP1_SECRET:=unencrypted:edsk3gUfUPyBSfrS9CCgmCiQsTCHGkviBDusMxDJstFtojtc1zcpsh}" - rpc=$((18730 + id)) - client_dir="$(mktemp -d -t tezos-tmp-client.XXXXXXXX)" - client_dirs+=("$client_dir") - signer="$local_signer -d $client_dir" - if [ -n "$USE_TLS" ]; then - client="$local_client -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - admin_client="$local_admin_client -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - alpha_baker="$local_alpha_baker -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - alpha_endorser="$local_alpha_endorser -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - alpha_accuser="$local_alpha_accuser -S -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - signer="$local_signer -S -base-dir $client_dir" - compiler="$local_compiler" - else - client="$local_client -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - admin_client="$local_admin_client -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - alpha_baker="$local_alpha_baker -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - alpha_endorser="$local_alpha_endorser -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - alpha_accuser="$local_alpha_accuser -base-dir $client_dir -addr 127.0.0.1 -port $rpc" - signer="$local_signer -base-dir $client_dir" - compiler="$local_compiler" - fi - parameters_file="${parameters_file:-$client_dir/protocol_parameters.json}" +: "${BOOTSTRAP2_IDENTITY:=tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN}" +: "${BOOTSTRAP2_PUBLIC:=edpktzNbDAUjUk697W7gYg2CRuBQjyPxbEg8dLccYYwKSKvkPvjtV9}" +: "${BOOTSTRAP2_SECRET:=unencrypted:edsk39qAm1fiMjgmPkw1EgQYkMzkJezLNewd7PLNHTkr6w9XA2zdfo}" - if ! [ -f "$parameters_file" ]; then - cat > "$parameters_file" < "$parameters_file" fi } @@ -119,30 +151,6 @@ wait_for_the_node_to_be_bootstraped() { ## Sandboxed client ######################################################## -# key pairs from $src_dir/test/sandbox.json - -BOOTSTRAP1_IDENTITY="tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" -BOOTSTRAP1_PUBLIC="edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" -BOOTSTRAP1_SECRET="unencrypted:edsk3gUfUPyBSfrS9CCgmCiQsTCHGkviBDusMxDJstFtojtc1zcpsh" - -BOOTSTRAP2_IDENTITY="tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" -BOOTSTRAP2_PUBLIC="edpktzNbDAUjUk697W7gYg2CRuBQjyPxbEg8dLccYYwKSKvkPvjtV9" -BOOTSTRAP2_SECRET="unencrypted:edsk39qAm1fiMjgmPkw1EgQYkMzkJezLNewd7PLNHTkr6w9XA2zdfo" - -BOOTSTRAP3_IDENTITY="tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" -BOOTSTRAP3_PUBLIC="edpkuTXkJDGcFd5nh6VvMz8phXxU3Bi7h6hqgywNFi1vZTfQNnS1RV" -BOOTSTRAP3_SECRET="unencrypted:edsk4ArLQgBTLWG5FJmnGnT689VKoqhXwmDPBuGx3z4cvwU9MmrPZZ" - -BOOTSTRAP4_IDENTITY="tz1b7tUupMgCNw2cCLpKTkSD1NZzB5TkP2sv" -BOOTSTRAP4_PUBLIC="edpkuFrRoDSEbJYgxRtLx2ps82UdaYc1WwfS9sE11yhauZt5DgCHbU" -BOOTSTRAP4_SECRET="unencrypted:edsk2uqQB9AY4FvioK2YMdfmyMrer5R8mGFyuaLLFfSRo8EoyNdht3" - -BOOTSTRAP5_IDENTITY="tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" -BOOTSTRAP5_PUBLIC="edpkv8EUUH68jmo3f7Um5PezmfGrRF24gnfLpH3sVNwJnV5bVCxL2n" -BOOTSTRAP5_SECRET="unencrypted:edsk4QLrcijEffxV31gGdN2HU7UpyJjA8drFoNcmnB28n89YjPNRFm" - -ACTIVATOR_SECRET="unencrypted:edsk31vznjHSSpGExDMHYASz45VZqXN4DPxvsa4hAyY8dHM28cZzp6" - add_sandboxed_bootstrap_identities() { ${client} import secret key bootstrap1 ${BOOTSTRAP1_SECRET} -- GitLab From 877e5dfdd1d17b79268ac2d9f499eb54d61b4c8d Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Wed, 9 Jan 2019 19:29:09 -0500 Subject: [PATCH 3/3] Allow bake() to be given a baker --- src/bin_client/test/test_lib.inc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin_client/test/test_lib.inc.sh b/src/bin_client/test/test_lib.inc.sh index c0b2f94d2722..a1498de009a6 100755 --- a/src/bin_client/test/test_lib.inc.sh +++ b/src/bin_client/test/test_lib.inc.sh @@ -7,6 +7,7 @@ cd "$test_dir" : "${log_dir:=$test_dir}" : "${sandbox_file:=$test_dir/sandbox.json}" : "${parameters_file:=$test_dir/protocol_parameters.json}" +: "${default_baker:=bootstrap1}" export TEZOS_CLIENT_UNSAFE_DISABLE_DISCLAIMER=Y @@ -133,7 +134,7 @@ init_contract_from_file () { } bake () { - $client bake for bootstrap1 --max-priority 512 --minimal-timestamp --minimal-fees 0 --minimal-nanotez-per-byte 0 --minimal-nanotez-per-gas-unit 0 + $client bake for "${1:-$default_baker}" --max-priority 512 --minimal-timestamp --minimal-fees 0 --minimal-nanotez-per-byte 0 --minimal-nanotez-per-gas-unit 0 } bake_after () { -- GitLab