mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
trident ext test: Patch upstream instread of relying on our fork
This commit is contained in:
parent
6980fa32e2
commit
2d038cddff
@ -41,10 +41,8 @@ function test_fn {
|
||||
|
||||
function trident_test
|
||||
{
|
||||
# TODO: Switch to https://github.com/sushiswap/trident / master once
|
||||
# https://github.com/sushiswap/trident/pull/282 gets merged.
|
||||
local repo="https://github.com/solidity-external-tests/trident.git"
|
||||
local branch=master_080
|
||||
local repo="https://github.com/sushiswap/trident"
|
||||
local branch=master
|
||||
local config_file="hardhat.config.ts"
|
||||
local config_var=config
|
||||
|
||||
@ -78,6 +76,14 @@ function trident_test
|
||||
replace_version_pragmas
|
||||
force_solc_modules "${DIR}/solc"
|
||||
|
||||
# BentoBoxV1Flat.sol requires a few small tweaks to compile on 0.8.x.
|
||||
# TODO: Remove once https://github.com/sushiswap/trident/pull/282 gets merged.
|
||||
sed -i 's|uint128(-1)|type(uint128).max|g' contracts/flat/BentoBoxV1Flat.sol
|
||||
sed -i 's|uint64(-1)|type(uint64).max|g' contracts/flat/BentoBoxV1Flat.sol
|
||||
sed -i 's|uint32(-1)|type(uint32).max|g' contracts/flat/BentoBoxV1Flat.sol
|
||||
sed -i 's|IERC20(0)|IERC20(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
|
||||
sed -i 's|IStrategy(0)|IStrategy(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
|
||||
|
||||
# @sushiswap/core package contains contracts that get built with 0.6.12 and fail our compiler
|
||||
# version check. It's not used by tests so we can remove it.
|
||||
rm -r node_modules/@sushiswap/core/
|
||||
|
Loading…
Reference in New Issue
Block a user