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 #6423 from ethereum/forceABIV2InExternalTests

Browse Source 
Force-activate ABIEncoderV2 in external tests.
This commit is contained in:
chriseth 2019-04-01 16:44:52 +02:00 committed by GitHub
commit 2ecd056534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/externalTests.sh
View File

@ -93,6 +93,21 @@ function replace_version_pragmas
find contracts test -name '*.sol' -type f -print0 | xargs -0 sed -i -e 's/pragma solidity [\^0-9\.]*/pragma solidity >=0.0/' find contracts test -name '*.sol' -type f -print0 | xargs -0 sed -i -e 's/pragma solidity [\^0-9\.]*/pragma solidity >=0.0/'
} }
function force_abi_v2
{
# Add "pragma experimental ABIEncoderV2" to all files.
printLog "Forcibly enabling ABIEncodreV2..."
find contracts test -name '*.sol' -type f -print0 | \
while IFS= read -r -d '' file
do
# Only add the pragma if it is not already there.
if grep -q -v 'pragma experimental ABIEncoderV2' "$file"
then
sed -i -e '1 i pragma experimental ABIEncoderV2;' "$file"
fi
done
}
function replace_libsolc_call function replace_libsolc_call
{ {
# Change "compileStandard" to "compile" (needed for pre-5.x Truffle) # Change "compileStandard" to "compile" (needed for pre-5.x Truffle)
@ -194,6 +209,8 @@ DIR=$(mktemp -d)
do do
clean clean
force_solc_settings "$CONFIG" "$optimize" "petersburg" force_solc_settings "$CONFIG" "$optimize" "petersburg"
# Force ABIEncoderV2 in the last step. Has to be the last because code is modified.
[[ "$optimize" =~ yul ]] && force_abi_v2
npx truffle compile npx truffle compile
verify_compiler_version "$SOLCVERSION" verify_compiler_version "$SOLCVERSION"
@ -220,6 +237,8 @@ DIR=$(mktemp -d)
do do
clean clean
force_solc_settings "$CONFIG" "$optimize" "petersburg" force_solc_settings "$CONFIG" "$optimize" "petersburg"
# Force ABIEncoderV2 in the last step. Has to be the last because code is modified.
[[ "$optimize" =~ yul ]] && force_abi_v2
npx truffle compile npx truffle compile
verify_compiler_version "$SOLCVERSION" verify_compiler_version "$SOLCVERSION"