From 08162f3686e99378ff2b342212d367a6f56292dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 27 Oct 2021 13:02:42 +0200 Subject: [PATCH] Switch ens external test to ens-contracts repo --- .circleci/config.yml | 6 ++---- test/externalTests/ens.sh | 25 ++++++++++--------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00c7223d5e72..0dbe49059463 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1186,8 +1186,7 @@ workflows: name: t_ems_compile_ext_ens project: ens compile_only: 1 - # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+. - nodejs_version: 10 + nodejs_version: 16 # FIXME: Gnosis tests are pretty flaky right now. They often fail on CircleCI due to random ProviderError # and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216. @@ -1211,8 +1210,7 @@ workflows: <<: *workflow_emscripten name: t_ems_test_ext_ens project: ens - # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+. - nodejs_version: 10 + nodejs_version: 16 # Windows build and tests - b_win: *workflow_trigger_on_tags diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh index 4b50062ad814..1eed6838fef9 100755 --- a/test/externalTests/ens.sh +++ b/test/externalTests/ens.sh @@ -27,34 +27,29 @@ source test/externalTests/common.sh verify_input "$1" export SOLJSON="$1" -function compile_fn { npx truffle compile; } -function test_fn { npm run test; } +function compile_fn { yarn build; } +function test_fn { yarn test; } function ens_test { - local repo="https://github.com/solidity-external-tests/ens.git" - local branch=master_080 - local config_file="truffle-config.js" + local repo="https://github.com/ensdomains/ens-contracts.git" + local branch=master + local config_file="hardhat-config.js" local min_optimizer_level=1 local max_optimizer_level=3 setup_solcjs "$DIR" "$SOLJSON" download_project "$repo" "$branch" "$DIR" - # Use latest Truffle. Older versions crash on the output from 0.8.0. - force_truffle_version ^5.1.55 - neutralize_package_lock neutralize_package_json_hooks - force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level" - npm install - - replace_version_pragmas - force_truffle_solc_modules "$SOLJSON" + force_hardhat_compiler_binary "$config_file" "$SOLJSON" + force_hardhat_compiler_settings "$config_file" "$min_optimizer_level" + yarn install for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do - truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn + hardhat_run_test "$config_file" "$level" compile_fn test_fn done } -external_test Ens ens_test +external_test ENS ens_test