diff --git a/.gitignore b/.gitignore index e12d283..8d9a463 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -eosio.csv \ No newline at end of file +eosio.csv +logs \ No newline at end of file diff --git a/eos-testnet/bootstrap.sh b/eos-testnet/bootstrap.sh index b509d04..61905af 100755 --- a/eos-testnet/bootstrap.sh +++ b/eos-testnet/bootstrap.sh @@ -15,6 +15,11 @@ retry() { done } +deploy_contract() { + cleos set contract $1 $2 -j -d -s -x 3600 > /tmp/trx + retry cleos sign -k $EOS_PRIVATE_KEY -p /tmp/trx +} + # https://eosio.stackexchange.com/a/5052/3555 curl -X POST http://127.0.0.1:8888/v1/producer/schedule_protocol_feature_activations -d '{"protocol_features_to_activate": ["0ec7e080177b2c02b278d5088611686b49d739925a92d9bfcacd7fc6b74053bd"]}' @@ -26,11 +31,11 @@ do cleos create account eosio ${x} $EOS_PUBLIC_KEY done -retry cleos set contract eosio /tmp/eosio.contracts/build/contracts/eosio.system/ +deploy_contract eosio /tmp/eosio.contracts/build/contracts/eosio.system/ for x in eosio.msig eosio.token eosio.wrap do - retry cleos set contract ${x} /tmp/eosio.contracts/build/contracts/${x}/ + deploy_contract ${x} /tmp/eosio.contracts/build/contracts/${x}/ done sleep 1 diff --git a/test_eosio.sh b/test_eosio.sh index 414f2e3..9a00a13 100755 --- a/test_eosio.sh +++ b/test_eosio.sh @@ -2,6 +2,9 @@ RETRY_LIMIT=${RETRY_LIMIT:-10} SAMPLE_SIZE=${1:-100} +rm -rf ./logs &> /dev/null +mkdir ./logs &> /dev/null + docker-compose rm -f &> /dev/null x=0 echo timestamp,attempt,retries @@ -32,5 +35,6 @@ do echo ! Retry limit exceeded >&2 fi echo $timestamp,$x,$y + docker logs eos-testnet &> logs/failures_${y}_run_${x}.log ((x+=1)) done