Skip to content

Commit bd36c5d

Browse files
Merge pull request #1 from gustavo-grieco/reduced-ci-tests
removed old solc versions, use 0.8.x only instead
2 parents ec55378 + cf76f78 commit bd36c5d

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,9 @@ jobs:
203203
- ubuntu-latest
204204
- windows-latest
205205
solc:
206-
- "0.4.25"
207-
- "0.5.7"
208-
- "0.6.12"
209-
- "0.7.5"
206+
- "0.8.10"
207+
- "0.8.25"
210208
include:
211-
- solc: "0.6.12"
212-
experimental: true
213-
- solc: "0.7.5"
214-
experimental: true
215209
- os: windows-latest
216210
experimental: true
217211

src/test/Tests/Integration.hs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module Tests.Integration (integrationTests) where
22

33
import Test.Tasty (TestTree, testGroup)
44

5-
import Common (testContract, testContractV, solcV, testContract', checkConstructorConditions, passed, solved, solvedLen, solvedWith, solvedWithout, gasInRange)
5+
import Common (testContract, testContractV, solcV, testContract', checkConstructorConditions, passed, solved, solvedLen, solvedWith, solvedWithout)
66
import Data.Functor ((<&>))
77
import Data.Text (unpack)
88
import Echidna.Types.Campaign (WorkerType(..))
@@ -60,8 +60,6 @@ integrationTests = testGroup "Solidity Integration Testing"
6060
[ ("echidna_library_call failed", solved "echidna_library_call")
6161
, ("echidna_valid_timestamp failed", passed "echidna_valid_timestamp")
6262
]
63-
, testContractV "basic/fallback.sol" (Just (< solcV (0,6,0))) Nothing
64-
[ ("echidna_fallback failed", solved "echidna_fallback") ]
6563
, testContract "basic/push_long.sol" (Just "basic/push_long.yaml")
6664
[ ("test_long_5 passed", solvedWithout NoCall "test_long_5")]
6765
, testContract "basic/propGasLimit.sol" (Just "basic/propGasLimit.yaml")
@@ -83,17 +81,8 @@ integrationTests = testGroup "Solidity Integration Testing"
8381
[ ("echidna_mutated passed", solved "echidna_mutated") ]
8482
, testContract "basic/darray-mutation.sol" Nothing
8583
[ ("echidna_mutated passed", solved "echidna_mutated") ]
86-
, testContract "basic/gasuse.sol" (Just "basic/gasuse.yaml")
87-
[ ("echidna_true failed", passed "echidna_true")
88-
, ("g gas estimate wrong", gasInRange "g" 130000 40000000)
89-
, ("f_close1 gas estimate wrong", gasInRange "f_close1" 400 2000)
90-
, ("f_open1 gas estimate wrong", gasInRange "f_open1" 18000 23000)
91-
, ("push_b gas estimate wrong", gasInRange "push_b" 39000 45000)
92-
]
9384
, testContract "basic/gaslimit.sol" Nothing
9485
[ ("echidna_gaslimit passed", passed "echidna_gaslimit") ]
95-
, testContractV "basic/killed.sol" (Just (< solcV (0,8,0))) (Just "basic/killed.yaml")
96-
[ ("echidna_still_alive failed", solved "echidna_still_alive") ]
9786
, checkConstructorConditions "basic/codesize.sol"
9887
"invalid codesize"
9988
, testContractV "basic/eip-170.sol" (Just (>= solcV (0,5,0))) (Just "basic/eip-170.yaml")

src/test/Tests/Research.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ researchTests :: TestTree
1010
researchTests = testGroup "Research-based Integration Testing"
1111
[ testContract "research/harvey_foo.sol" Nothing
1212
[ ("echidna_assert failed", solved "echidna_assert") ]
13-
, testContract' "research/harvey_baz.sol" Nothing Nothing Nothing False FuzzWorker
13+
, testContract "research/harvey_baz.sol" Nothing
1414
[ ("echidna_all_states failed", solved "echidna_all_states") ]
1515
, testContract' "research/ilf_crowdsale.sol" Nothing (Just (\v -> v >= solcV (0,5,0) && v < solcV (0,6,0))) (Just "research/ilf_crowdsale.yaml") False FuzzWorker
1616
[ ("echidna_assert failed", solved "withdraw") ]

0 commit comments

Comments
 (0)