From 98ec1fb0677e612fba9bc493f930f0e279873a4f Mon Sep 17 00:00:00 2001 From: Dusan Klinec Date: Wed, 13 Apr 2022 10:35:05 +0200 Subject: [PATCH] chore(core/monero): update test binary to newest version [no changelog] Co-authored-by: Martin Milata --- ci/shell.nix | 4 ++-- core/tests/run_tests_device_emu_monero.sh | 19 +++---------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/ci/shell.nix b/ci/shell.nix index 4b507fd16..28e6c4af2 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -19,8 +19,8 @@ let sha256 = "02s3qkb6kz3ndyx7rfndjbvp4vlwiqc42fxypn3g6jnc0v5jyz95"; }) { }; moneroTests = nixpkgs.fetchurl { - url = "https://github.com/ph4r05/monero/releases/download/v0.17.3.0-dev-tests/trezor_tests"; - sha256 = "sha256-tTQTe/Yk6oURq7GDOEotJ7Y2UpCgyuU5odjEHNTMrmE="; + url = "https://github.com/ph4r05/monero/releases/download/v0.17.3.2-dev-tests-u18.04-01/trezor_tests"; + sha256 = "a9f5ac4f0ea908a132d1b1d2a49917ac35ca2a7166fb5178498f3342329d0a5c"; }; moneroTestsPatched = nixpkgs.runCommandCC "monero_trezor_tests" {} '' cp ${moneroTests} $out diff --git a/core/tests/run_tests_device_emu_monero.sh b/core/tests/run_tests_device_emu_monero.sh index 78e98b683..1ae45387b 100755 --- a/core/tests/run_tests_device_emu_monero.sh +++ b/core/tests/run_tests_device_emu_monero.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -: "${RUN_PYTHON_TESTS:=0}" : "${FORCE_DOCKER_USE:=0}" CORE_DIR="$(SHELL_SESSION_FILE='' && cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )" @@ -15,19 +14,7 @@ terminate_test() { set -e trap terminate_test EXIT -# run tests -export EC_BACKEND_FORCE=1 -export EC_BACKEND=1 -export TREZOR_TEST_GET_TX=1 -export TREZOR_TEST_LIVE_REFRESH=1 -export TREZOR_TEST_SIGN_CL0_HF9=0 # HF9 is no longer active -export TREZOR_TEST_SIGN_CL1_HF9=1 -export TREZOR_TEST_SIGN_CL1_HF10=1 -error=0 - -if [[ "$RUN_PYTHON_TESTS" != 0 ]]; then - python3 -m unittest trezor_monero_test.test_trezor || exit $? -fi +export TEST_MIN_HF=13 # No need to test hard fork 12 or lower if [[ "$OSTYPE" != "linux-gnu" && "$OSTYPE" != "darwin"* ]]; then echo "Tests with native Monero app is supported only on Linux and OSX at the moment. Your OS: $OSTYPE" @@ -36,8 +23,8 @@ fi # When updating URL and sha256sum also update the URL in ci/shell.nix. error=1 -: "${TREZOR_MONERO_TESTS_URL:=https://github.com/ph4r05/monero/releases/download/v0.15.0.0-tests-u18.04-03/trezor_tests}" -: "${TREZOR_MONERO_TESTS_SHA256SUM:=1e5dfdb07de4ea46088f4a5bdb0d51f040fe479019efae30f76427eee6edb3f7}" +: "${TREZOR_MONERO_TESTS_URL:=https://github.com/ph4r05/monero/releases/download/v0.17.3.0-dev-tests/trezor_tests}" +: "${TREZOR_MONERO_TESTS_SHA256SUM:=b534137bf624ea8511abb183384a2d27b6365290a0cae539a1d8c41cd4ccae61}" : "${TREZOR_MONERO_TESTS_PATH:=$CORE_DIR/tests/trezor_monero_tests}" : "${TREZOR_MONERO_TESTS_LOG:=$CORE_DIR/tests/trezor_monero_tests.log}" : "${TREZOR_MONERO_TESTS_CHAIN:=$CORE_DIR/tests/trezor_monero_tests.chain}"