cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13481 from ethereum/fix-artifacts-check-in-hardhat-external-tests

Browse Source 
Fix compiler version check in hardhat artifacts json
This commit is contained in:
Daniel Kirchner 2022-09-05 16:03:22 +02:00 committed by GitHub
commit 99f15ff04e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/externalTests/common.sh
View File

@ -357,8 +357,8 @@ function hardhat_verify_compiler_version
local build_info_files local build_info_files
build_info_files=$(find . -path '*artifacts/build-info/*.json') build_info_files=$(find . -path '*artifacts/build-info/*.json')
for build_info_file in $build_info_files; do for build_info_file in $build_info_files; do
grep '"solcVersion": "'"${solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}." grep '"solcVersion":[[:blank:]]*"'"${solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
grep '"solcLongVersion": "'"${full_solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}." grep '"solcLongVersion":[[:blank:]]*"'"${full_solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
done done
} }

2
test/externalTests/zeppelin.sh
View File

@ -108,6 +108,8 @@ function zeppelin_test
sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
sed -i "s|it(\('prevents initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js sed -i "s|it(\('prevents initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
sed -i "s|it(\('divide by 0'\)|it.skip(\1|g" test/utils/math/Math.test.js sed -i "s|it(\('divide by 0'\)|it.skip(\1|g" test/utils/math/Math.test.js
sed -i "s|it(\('pending owner resets after renouncing ownership'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
sed -i "s|it(\('guards transfer against invalid user'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
# CAUTION:: The following two sed commands depend on the order of occurrence of the relevant patterns in the mentioned files. # CAUTION:: The following two sed commands depend on the order of occurrence of the relevant patterns in the mentioned files.
# Could result in an error in the future. # Could result in an error in the future.
sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js