fixes

Author: gustavo-grieco

flake.nix

@@ -55,7 +55,7 @@
           (pkgs.haskellPackages.callCabal2nix "hevm" (pkgs.fetchFromGitHub {
             owner = "ethereum";
             repo = "hevm";
-            rev = "d282dff6e0d9ea9f7cf02e17e8ac0b268ef634da";
+            rev = "2931f09fcbbca68911421fbe2f2f21ebebdb5332";
             sha256 = "sha256-PX0vm1K4DWiX6hiITdCqniMSAtxpQHezzIGdWGwmjrc=";
           }) { secp256k1 = pkgs.secp256k1; })
           ([

src/test/Common.hs

@@ -40,6 +40,9 @@ import Data.SemVer (Version, version, fromText)
 import Data.Text (Text, pack)
 import System.Process (readProcess)
 
+import EVM.Solidity (Contracts(..), BuildOutput(..), SolcContract(..))
+import EVM.Types hiding (Env, Gas)
+
 import Echidna (mkEnv, prepareContract)
 import Echidna.Config (parseConfig, defaultConfig)
 import Echidna.Campaign (runWorker)
@@ -52,11 +55,9 @@ import Echidna.Types.Signature (ContractName)
 import Echidna.Types.Solidity (SolConf(..))
 import Echidna.Types.Test
 import Echidna.Types.Tx (Tx(..), TxCall(..))
+import Echidna.Types.Worker (WorkerType(..))
 import Echidna.Types.World (World(..))
 
-import EVM.Solidity (Contracts(..), BuildOutput(..), SolcContract(..))
-import EVM.Types hiding (Env, Gas)
-
 testConfig :: EConfig
 testConfig = defaultConfig & overrideQuiet
                            & overrideLimits

src/test/Tests/Assertion.hs

@@ -4,7 +4,7 @@ import Test.Tasty (TestTree, testGroup)
 
 import Common (testContract, testContract', testContractV, solcV, solved, solvedUsing, passed)
 
-import Echidna.Types.Campaign (WorkerType(..))
+import Echidna.Types.Worker (WorkerType(..))
 
 assertionTests :: TestTree
 assertionTests = testGroup "Assertion-based Integration Testing"

src/test/Tests/Cheat.hs

@@ -4,7 +4,7 @@ import Test.Tasty (TestTree, testGroup)
 
 import Common (testContract', solcV, solved, passed)
 
-import Echidna.Types.Campaign (WorkerType(..))
+import Echidna.Types.Worker (WorkerType(..))
 
 cheatTests :: TestTree
 cheatTests =

src/test/Tests/Dapptest.hs

@@ -4,7 +4,7 @@ import Test.Tasty (TestTree, testGroup)
 
 import Common (testContract', solcV, solved, passed)
 
-import Echidna.Types.Campaign (WorkerType(..))
+import Echidna.Types.Worker (WorkerType(..))
 
 dapptestTests :: TestTree
 dapptestTests = testGroup "Dapptest Integration Testing"

src/test/Tests/Integration.hs

@@ -5,7 +5,7 @@ import Test.Tasty (TestTree, testGroup)
 import Common (testContract, testContractV, solcV, testContract', checkConstructorConditions, passed, solved, solvedLen, solvedWith, solvedWithout)
 import Data.Functor ((<&>))
 import Data.Text (unpack)
-import Echidna.Types.Campaign (WorkerType(..))
+import Echidna.Types.Worker (WorkerType(..))
 import Echidna.Types.Tx (TxCall(..))
 import EVM.ABI (AbiValue(..))
 

src/test/Tests/Research.hs

@@ -4,7 +4,7 @@ import Test.Tasty (TestTree, testGroup)
 
 import Common (testContract, testContract', solcV, solved)
 
-import Echidna.Types.Campaign (WorkerType(..))
+import Echidna.Types.Worker (WorkerType(..))
 
 researchTests :: TestTree
 researchTests = testGroup "Research-based Integration Testing"

src/test/Tests/Seed.hs

@@ -12,6 +12,7 @@ import Echidna.Types.Campaign
 import Echidna.Types.Config (Env(..), EConfig(..))
 import Echidna.Types.Coverage (CoverageFileType(..))
 import Echidna.Types.Test
+import Echidna.Types.Worker (WorkerType(..))
 
 seedTests :: TestTree
 seedTests =

src/test/Tests/Symbolic.hs

@@ -2,7 +2,7 @@ module Tests.Symbolic (symbolicTests) where
 
 import Test.Tasty (TestTree, testGroup)
 import Common (testContract', solved, verified)
-import Echidna.Types.Campaign (WorkerType(..))
+import Echidna.Types.Worker (WorkerType(..))
 
 symbolicTests :: TestTree
 symbolicTests = testGroup "Symbolic tests"

src/test/Tests/Values.hs

@@ -4,7 +4,7 @@ import Test.Tasty (TestTree, testGroup)
 
 import Common (testContract, testContract', solved, solvedLen)
 
-import Echidna.Types.Campaign (WorkerType(..))
+import Echidna.Types.Worker (WorkerType(..))
 
 valuesTests :: TestTree
 valuesTests = testGroup "Value extraction tests"