fix build 4: return of the son of fix build

pull/151/head
JP Smith 6 years ago
parent 558dc71b1f
commit 3f7308c7d6
  1. 1
      .travis.yml
  2. 16
      .travis/install-libsecp256k1.sh
  3. 9
      lib/Echidna/Config.hs
  4. 18
      package.yaml
  5. 22
      stack.yaml

@ -23,6 +23,7 @@ matrix:
install:
- unset CC
- export PATH=$HOME/.local/bin:$PATH
- ./.travis/install-libsecp256k1.sh
- ./.travis/install-ghr.sh
- ./.travis/install-stack.sh

@ -0,0 +1,16 @@
#!/bin/sh
set -eux
gitRef="1086fda4c1975d0cad8d3cad96794a64ec12dca4"
curl -LO "https://github.com/bitcoin-core/secp256k1/archive/$gitRef.zip"
unzip "$gitRef.zip"
cd "secp256k1-$gitRef"
./autogen.sh
# hevm needs reecovery module
# enable pic so static library can link against dynamic correctly
./configure --enable-module-recovery --with-pic
sudo make install

@ -58,7 +58,7 @@ instance FromJSON Config where
newtype ParseException = ParseException FilePath
defaultConfig :: Config
defaultConfig = either (error "Config parser got messed up :(") id $ Y.decodeEither ""
defaultConfig = either (error "Config parser got messed up :(") id $ Y.decodeEither' ""
instance Show ParseException where
show (ParseException f) = "Could not parse config file " ++ show f
@ -66,12 +66,7 @@ instance Show ParseException where
instance Exception ParseException
parseConfig :: (MonadThrow m, MonadIO m) => FilePath -> m Config
parseConfig file = do
content <- liftIO $ BS.readFile file
let parsedContent = Y.decode content :: Maybe Config
case parsedContent of
Nothing -> throwM (ParseException file)
(Just c) -> return c
parseConfig f = liftIO (BS.readFile f) >>= Y.decodeThrow
withDefaultConfig :: ReaderT Config m a -> m a
withDefaultConfig = (`runReaderT` defaultConfig)

@ -7,24 +7,24 @@ version: 0.0.0.1
ghc-options: -Wall -fno-warn-orphans -O2
dependencies:
- aeson
- aeson >= 1.3 && < 1.5
- base
- ansi-terminal
- bytestring >= 0.10.8 && < 0.11
- containers >= 0.5.7 && < 0.6
- data-dword >= 0.3.1 && < 0.4
- deepseq
- directory
- exceptions >= 0.8.1 && < 0.9
- directory >= 1.3 && < 1.4
- exceptions >= 0.8.1 && < 0.11
- hedgehog >= 0.6
- hevm
- lens >= 4.15.1 && < 4.16
- lens >= 4.15.1 && < 4.17
- mtl >= 2.2.1 && < 2.3
- multiset >= 0.3 && < 0.4
- optparse-applicative >= 0.12.0 && < 0.14
- process >= 1.4.3 && < 1.5
- optparse-applicative >= 0.13.0 && < 0.15
- process >= 1.4.3 && < 1.7
- stm
- temporary >= 1.2.1 && < 1.3
- temporary >= 1.2.1 && < 1.4
- text >= 1.2.2 && < 1.3
- transformers
- vector >= 0.11.0 && < 0.13
@ -50,6 +50,10 @@ executables:
main: Main.hs
source-dirs: src/
dependencies: echidna
echidna-diagnose:
main: Main.hs
source-dirs: diagnose
dependencies: echidna
revert-example-exe:
main: Revert.hs
source-dirs: examples/revert

@ -1,25 +1,19 @@
resolver: lts-8.15
resolver: lts-12.18
packages:
- '.'
extra-deps:
- git: https://github.com/dapphub/hevm.git
commit: 40b4ce9d38ed711ffd6065e697807100b3f0a3c3
- brick-0.18
- config-ini-0.2.1.1
- data-clist-0.1.2.0
- ghci-pretty-0.0.2
- hedgehog-0.6
- hevm-0.21
- HSH-2.1.3
- ipprint-0.6
- megaparsec-6.4.0
- optparse-applicative-0.13.2.0
- parser-combinators-0.4.0
- restless-git-0.5.0
- multiset-0.3.4.1
- readline-1.0.3.0
- restless-git-0.7
- rosezipper-0.2
- s-cargot-0.1.4.0
- sr-extra-1.46.3.2
- temporary-1.2.1.1
- text-format-0.3.2
- tree-view-0.5
- vty-5.16
- word-wrap-0.4.1
- Unixutils-1.54.1

Loading…
Cancel
Save