Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,9 @@ jobs:
- ubuntu-latest
- windows-latest
solc:
- "0.4.25"
- "0.5.7"
- "0.6.12"
- "0.7.5"
- "0.8.10"
- "0.8.25"
include:
- solc: "0.6.12"
experimental: true
- solc: "0.7.5"
experimental: true
- os: windows-latest
experimental: true

Expand Down
13 changes: 1 addition & 12 deletions src/test/Tests/Integration.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Tests.Integration (integrationTests) where

import Test.Tasty (TestTree, testGroup)

import Common (testContract, testContractV, solcV, testContract', checkConstructorConditions, passed, solved, solvedLen, solvedWith, solvedWithout, gasInRange)
import Common (testContract, testContractV, solcV, testContract', checkConstructorConditions, passed, solved, solvedLen, solvedWith, solvedWithout)
import Data.Functor ((<&>))
import Data.Text (unpack)
import Echidna.Types.Campaign (WorkerType(..))
Expand Down Expand Up @@ -60,8 +60,6 @@ integrationTests = testGroup "Solidity Integration Testing"
[ ("echidna_library_call failed", solved "echidna_library_call")
, ("echidna_valid_timestamp failed", passed "echidna_valid_timestamp")
]
, testContractV "basic/fallback.sol" (Just (< solcV (0,6,0))) Nothing
[ ("echidna_fallback failed", solved "echidna_fallback") ]
, testContract "basic/push_long.sol" (Just "basic/push_long.yaml")
[ ("test_long_5 passed", solvedWithout NoCall "test_long_5")]
, testContract "basic/propGasLimit.sol" (Just "basic/propGasLimit.yaml")
Expand All @@ -83,17 +81,8 @@ integrationTests = testGroup "Solidity Integration Testing"
[ ("echidna_mutated passed", solved "echidna_mutated") ]
, testContract "basic/darray-mutation.sol" Nothing
[ ("echidna_mutated passed", solved "echidna_mutated") ]
, testContract "basic/gasuse.sol" (Just "basic/gasuse.yaml")
[ ("echidna_true failed", passed "echidna_true")
, ("g gas estimate wrong", gasInRange "g" 130000 40000000)
, ("f_close1 gas estimate wrong", gasInRange "f_close1" 400 2000)
, ("f_open1 gas estimate wrong", gasInRange "f_open1" 18000 23000)
, ("push_b gas estimate wrong", gasInRange "push_b" 39000 45000)
]
, testContract "basic/gaslimit.sol" Nothing
[ ("echidna_gaslimit passed", passed "echidna_gaslimit") ]
, testContractV "basic/killed.sol" (Just (< solcV (0,8,0))) (Just "basic/killed.yaml")
[ ("echidna_still_alive failed", solved "echidna_still_alive") ]
, checkConstructorConditions "basic/codesize.sol"
"invalid codesize"
, testContractV "basic/eip-170.sol" (Just (>= solcV (0,5,0))) (Just "basic/eip-170.yaml")
Expand Down
2 changes: 1 addition & 1 deletion src/test/Tests/Research.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ researchTests :: TestTree
researchTests = testGroup "Research-based Integration Testing"
[ testContract "research/harvey_foo.sol" Nothing
[ ("echidna_assert failed", solved "echidna_assert") ]
, testContract' "research/harvey_baz.sol" Nothing Nothing Nothing False FuzzWorker
, testContract "research/harvey_baz.sol" Nothing
[ ("echidna_all_states failed", solved "echidna_all_states") ]
, 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
[ ("echidna_assert failed", solved "withdraw") ]
Expand Down
Loading