Skip to content

Commit 25923c1

Browse files
cameelcameel
authored
Merge pull request #12562 from ethereum/brink-ext-test
External test for Brink
2 parents 9e92c7a + 8e08543 commit 25923c1

File tree

4 files changed

+123
-14
lines changed

4 files changed

+123
-14
lines changed

‎.circleci/config.yml

+8
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,12 @@ defaults:
582582
binary_type: native
583583
nodejs_version: '16'
584584
resource_class: medium
585+
- job_native_test_ext_brink: &job_native_test_ext_brink
586+
<<: *workflow_ubuntu2004_static
587+
name: t_native_test_ext_brink
588+
project: brink
589+
binary_type: native
590+
nodejs_version: '16'
585591
- job_ems_test_ext_colony: &job_ems_test_ext_colony
586592
<<: *workflow_emscripten
587593
name: t_ems_test_ext_colony
@@ -1470,6 +1476,7 @@ workflows:
14701476
- t_ems_ext: *job_native_test_ext_uniswap
14711477
- t_ems_ext: *job_native_test_ext_prb_math
14721478
- t_ems_ext: *job_native_test_ext_elementfi
1479+
- t_ems_ext: *job_native_test_ext_brink
14731480

14741481
- c_ext_benchmarks:
14751482
<<: *workflow_trigger_on_tags
@@ -1487,6 +1494,7 @@ workflows:
14871494
- t_native_test_ext_uniswap
14881495
- t_native_test_ext_prb_math
14891496
- t_native_test_ext_elementfi
1497+
- t_native_test_ext_brink
14901498

14911499
# Windows build and tests
14921500
- b_win: *workflow_trigger_on_tags

‎test/externalTests.sh

+1
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ printTask "Running external tests..."
5050
"${REPO_ROOT}/test/externalTests/uniswap.sh" "$@"
5151
"${REPO_ROOT}/test/externalTests/prb-math.sh" "$@"
5252
"${REPO_ROOT}/test/externalTests/elementfi.sh" "$@"
53+
"${REPO_ROOT}/test/externalTests/brink.sh" "$@"

‎test/externalTests/brink.sh

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
#!/usr/bin/env bash
2+
3+
# ------------------------------------------------------------------------------
4+
# This file is part of solidity.
5+
#
6+
# solidity is free software: you can redistribute it and/or modify
7+
# it under the terms of the GNU General Public License as published by
8+
# the Free Software Foundation, either version 3 of the License, or
9+
# (at your option) any later version.
10+
#
11+
# solidity is distributed in the hope that it will be useful,
12+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
# GNU General Public License for more details.
15+
#
16+
# You should have received a copy of the GNU General Public License
17+
# along with solidity. If not, see <http://www.gnu.org/licenses/>
18+
#
19+
# (c) 2022 solidity contributors.
20+
#------------------------------------------------------------------------------
21+
22+
set -e
23+
24+
source scripts/common.sh
25+
source test/externalTests/common.sh
26+
27+
REPO_ROOT=$(realpath "$(dirname "$0")/../..")
28+
29+
verify_input "$@"
30+
BINARY_TYPE="$1"
31+
BINARY_PATH="$2"
32+
SELECTED_PRESETS="$3"
33+
34+
function compile_fn { yarn compile; }
35+
function test_fn { SNAPSHOT_UPDATE=1 npx --no hardhat test; }
36+
37+
function brink_test
38+
{
39+
local repo="https://github.com/brinktrade/brink-core"
40+
local ref_type=branch
41+
local ref=master
42+
local config_file="hardhat.config.js"
43+
local config_var=""
44+
local extra_settings="metadata: {bytecodeHash: 'none'}"
45+
local extra_optimizer_settings="runs: 800"
46+
47+
local compile_only_presets=(
48+
#ir-no-optimize # Compilation fails with "YulException: Variable var_signature_127_offset is 2 slot(s) too deep inside the stack."
49+
#ir-optimize-evm-only # Compilation fails with "YulException: Variable var_signature_127_offset is 2 slot(s) too deep inside the stack."
50+
ir-optimize-evm+yul # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
51+
legacy-optimize-evm+yul # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
52+
legacy-no-optimize # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
53+
legacy-optimize-evm-only # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
54+
)
55+
local settings_presets=(
56+
"${compile_only_presets[@]}"
57+
)
58+
59+
[[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
60+
print_presets_or_exit "$SELECTED_PRESETS"
61+
62+
setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
63+
download_project "$repo" "$ref_type" "$ref" "$DIR"
64+
65+
neutralize_package_lock
66+
neutralize_package_json_hooks
67+
force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
68+
force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
69+
yarn install
70+
yarn add hardhat-gas-reporter
71+
72+
# TODO: Remove when https://github.com/brinktrade/brink-core/issues/48 is fixed.
73+
yarn add chai
74+
75+
replace_version_pragmas
76+
77+
for preset in $SELECTED_PRESETS; do
78+
hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var" "$extra_settings" "$extra_optimizer_settings"
79+
store_benchmark_report hardhat brink "$repo" "$preset"
80+
done
81+
}
82+
83+
external_test Brink brink_test

‎test/externalTests/common.sh

+31-14
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function force_truffle_compiler_settings
198198
local solc_path="$3"
199199
local preset="$4"
200200
local evm_version="${5:-"$CURRENT_EVM_VERSION"}"
201+
local extra_settings="$6"
202+
local extra_optimizer_settings="$7"
201203

202204
[[ $binary_type == native || $binary_type == solcjs ]] || assertFail
203205

@@ -209,14 +211,14 @@ function force_truffle_compiler_settings
209211
echo "Binary type: $binary_type"
210212
echo "Compiler path: $solc_path"
211213
echo "Settings preset: ${preset}"
212-
echo "Settings: $(settings_from_preset "$preset" "$evm_version")"
214+
echo "Settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
213215
echo "EVM version: $evm_version"
214216
echo "Compiler version: ${SOLCVERSION_SHORT}"
215217
echo "Compiler version (full): ${SOLCVERSION}"
216218
echo "-------------------------------------"
217219

218220
local compiler_settings gas_reporter_settings
219-
compiler_settings=$(truffle_compiler_settings "$solc_path" "$preset" "$evm_version")
221+
compiler_settings=$(truffle_compiler_settings "$solc_path" "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")
220222
gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
221223

222224
{
@@ -307,19 +309,21 @@ function force_hardhat_compiler_settings
307309
local preset="$2"
308310
local config_var_name="$3"
309311
local evm_version="${4:-"$CURRENT_EVM_VERSION"}"
312+
local extra_settings="$5"
313+
local extra_optimizer_settings="$6"
310314

311315
printLog "Configuring Hardhat..."
312316
echo "-------------------------------------"
313317
echo "Config file: ${config_file}"
314318
echo "Settings preset: ${preset}"
315-
echo "Settings: $(settings_from_preset "$preset" "$evm_version")"
319+
echo "Settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
316320
echo "EVM version: ${evm_version}"
317321
echo "Compiler version: ${SOLCVERSION_SHORT}"
318322
echo "Compiler version (full): ${SOLCVERSION}"
319323
echo "-------------------------------------"
320324

321325
local compiler_settings gas_reporter_settings
322-
compiler_settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version")
326+
compiler_settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")
323327
gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
324328
if [[ $config_file == *\.js ]]; then
325329
[[ $config_var_name == "" ]] || assertFail
@@ -372,17 +376,22 @@ function settings_from_preset
372376
{
373377
local preset="$1"
374378
local evm_version="$2"
379+
local extra_settings="$3"
380+
local extra_optimizer_settings="$4"
375381

376382
[[ " ${AVAILABLE_PRESETS[*]} " == *" $preset "* ]] || assertFail
377383

384+
[[ $extra_settings == "" ]] || extra_settings="${extra_settings}, "
385+
[[ $extra_optimizer_settings == "" ]] || extra_optimizer_settings="${extra_optimizer_settings}, "
386+
378387
case "$preset" in
379388
# NOTE: Remember to update `parallelism` of `t_ems_ext` job in CI config if you add/remove presets
380-
legacy-no-optimize) echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: false}}" ;;
381-
ir-no-optimize) echo "{evmVersion: '${evm_version}', viaIR: true, optimizer: {enabled: false}}" ;;
382-
legacy-optimize-evm-only) echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: true, details: {yul: false}}}" ;;
383-
ir-optimize-evm-only) echo "{evmVersion: '${evm_version}', viaIR: true, optimizer: {enabled: true, details: {yul: false}}}" ;;
384-
legacy-optimize-evm+yul) echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: true, details: {yul: true}}}" ;;
385-
ir-optimize-evm+yul) echo "{evmVersion: '${evm_version}', viaIR: true, optimizer: {enabled: true, details: {yul: true}}}" ;;
389+
legacy-no-optimize) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: false}}" ;;
390+
ir-no-optimize) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true, optimizer: {${extra_optimizer_settings}enabled: false}}" ;;
391+
legacy-optimize-evm-only) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: false}}}" ;;
392+
ir-optimize-evm-only) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: false}}}" ;;
393+
legacy-optimize-evm+yul) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: true}}}" ;;
394+
ir-optimize-evm+yul) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: true}}}" ;;
386395
*)
387396
fail "Unknown settings preset: '${preset}'."
388397
;;
@@ -419,11 +428,13 @@ function truffle_compiler_settings
419428
local solc_path="$1"
420429
local preset="$2"
421430
local evm_version="$3"
431+
local extra_settings="$4"
432+
local extra_optimizer_settings="$5"
422433

423434
echo "{"
424435
echo " solc: {"
425436
echo " version: \"${solc_path}\","
426-
echo " settings: $(settings_from_preset "$preset" "$evm_version")"
437+
echo " settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
427438
echo " }"
428439
echo "}"
429440
}
@@ -468,10 +479,12 @@ function hardhat_compiler_settings {
468479
local solc_version="$1"
469480
local preset="$2"
470481
local evm_version="$3"
482+
local extra_settings="$4"
483+
local extra_optimizer_settings="$5"
471484

472485
echo "{"
473486
echo " version: '${solc_version}',"
474-
echo " settings: $(settings_from_preset "$preset" "$evm_version")"
487+
echo " settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
475488
echo "}"
476489
}
477490

@@ -506,9 +519,11 @@ function truffle_run_test
506519
local compile_only_presets="$5"
507520
local compile_fn="$6"
508521
local test_fn="$7"
522+
local extra_settings="$8"
523+
local extra_optimizer_settings="$9"
509524

510525
truffle_clean
511-
force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$preset"
526+
force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$preset" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
512527
compile_and_run_test compile_fn test_fn truffle_verify_compiler_version "$preset" "$compile_only_presets"
513528
}
514529

@@ -520,9 +535,11 @@ function hardhat_run_test
520535
local compile_fn="$4"
521536
local test_fn="$5"
522537
local config_var_name="$6"
538+
local extra_settings="$7"
539+
local extra_optimizer_settings="$8"
523540

524541
hardhat_clean
525-
force_hardhat_compiler_settings "$config_file" "$preset" "$config_var_name"
542+
force_hardhat_compiler_settings "$config_file" "$preset" "$config_var_name" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
526543
compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version "$preset" "$compile_only_presets"
527544
}
528545

0 commit comments

Comments
 (0)