cerc-io/solidity
10
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

Simplify functions for setting solc version in Truffle config

Browse Source
This commit is contained in:
Kamil Śliwak 2020-12-08 16:23:37 +01:00
parent 8cd6e15333
commit a66ab1eb4e
1 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/externalTests/common.sh
View File

@ -109,8 +109,10 @@ function replace_version_pragmas
find . test -name '*.sol' -type f -print0 | xargs -0 sed -i -E -e 's/pragma solidity [^;]+;/pragma solidity >=0.0;/' find . test -name '*.sol' -type f -print0 | xargs -0 sed -i -E -e 's/pragma solidity [^;]+;/pragma solidity >=0.0;/'
} }
function force_solc_truffle_modules function force_truffle_solc_modules
{ {
local soljson="$1"
# Replace solc package by v0.5.0 and then overwrite with current version. # Replace solc package by v0.5.0 and then overwrite with current version.
printLog "Forcing solc version for all Truffle modules..." printLog "Forcing solc version for all Truffle modules..."
for d in node_modules node_modules/truffle/node_modules for d in node_modules node_modules/truffle/node_modules
@ -120,7 +122,7 @@ function force_solc_truffle_modules
cd $d cd $d
rm -rf solc rm -rf solc
git clone --depth 1 -b master https://github.com/ethereum/solc-js.git solc git clone --depth 1 -b master https://github.com/ethereum/solc-js.git solc
cp "$1" solc/soljson.js cp "$soljson" solc/soljson.js
cd solc cd solc
npm install npm install
@ -129,29 +131,17 @@ function force_solc_truffle_modules
done done
} }
function force_solc function force_truffle_compiler_settings
{ {
local config_file="$1" local config_file="$1"
local dir="$2" local solc_path="$2"
local soljson="$3" local level="$3"
local evm_version="$4"
force_solc_truffle_modules "$soljson" printLog "Forcing Truffle compiler settings..."
printLog "Forcing solc version..."
cat >> "$config_file" <<EOF
module.exports['compilers'] = $(truffle_compiler_settings "${dir}/solc" "$level" "$evm_version");
EOF
}
function force_solc_settings
{
local config_file="$1"
local level="$2"
local evm_version="$3"
printLog "Forcing solc settings..."
echo "-------------------------------------" echo "-------------------------------------"
echo "Config file: $config_file" echo "Config file: $config_file"
echo "Compiler path: $solc_path"
echo "Optimization level: $level" echo "Optimization level: $level"
echo "Optimizer settings: $(optimizer_settings_for_level "$level")" echo "Optimizer settings: $(optimizer_settings_for_level "$level")"
echo "EVM version: $evm_version" echo "EVM version: $evm_version"
@ -159,7 +149,7 @@ function force_solc_settings
# Forcing the settings should always work by just overwriting the solc object. Forcing them by using a # Forcing the settings should always work by just overwriting the solc object. Forcing them by using a
# dedicated settings objects should only be the fallback. # dedicated settings objects should only be the fallback.
echo "module.exports['compilers'] = $(truffle_compiler_settings "${DIR}/solc" "$level" "$evm_version");" >> "$config_file" echo "module.exports['compilers'] = $(truffle_compiler_settings "$solc_path" "$level" "$evm_version");" >> "$config_file"
} }
function verify_compiler_version function verify_compiler_version
@ -182,7 +172,8 @@ function run_install
printLog "Running install function..." printLog "Running install function..."
replace_version_pragmas replace_version_pragmas
force_solc "$CONFIG" "$DIR" "$soljson" force_truffle_solc_modules "$soljson"
force_truffle_compiler_settings "$CONFIG" "${DIR}/solc" "$OPTIMIZER_LEVEL" istanbul
$init_fn $init_fn
} }
@ -201,13 +192,6 @@ function run_test
$test_fn $test_fn
} }
function solc_settings {
local level="$1"
local evm_version="$2"
echo "{optimizer: $(optimizer_settings_for_level "$level"), evmVersion: \"$evm_version\"}"
}
function optimizer_settings_for_level { function optimizer_settings_for_level {
local level="$1" local level="$1"
@ -245,12 +229,12 @@ function truffle_run_test
local test_fn="$3" local test_fn="$3"
replace_version_pragmas replace_version_pragmas
force_solc "$CONFIG" "$DIR" "$soljson" force_truffle_solc_modules "$soljson"
for level in $(seq "$OPTIMIZER_LEVEL" 3) for level in $(seq "$OPTIMIZER_LEVEL" 3)
do do
clean clean
force_solc_settings "$CONFIG" "$level" istanbul force_truffle_compiler_settings "$CONFIG" "${DIR}/solc" "$level" istanbul
printLog "Running compile function..." printLog "Running compile function..."
$compile_fn $compile_fn