onicrom
diff --git a/‎.hlint.yaml
+93 b/‎.hlint.yaml
+93
diff --git a/‎HLint.hs
-516 b/‎HLint.hs
-516
diff --git a/‎appveyor.yml
+16-2 b/‎appveyor.yml
+16-2
diff --git a/‎auxx/Main.hs
+3-3 b/‎auxx/Main.hs
+3-3
diff --git a/‎auxx/cardano-sl-auxx.cabal
+2-1 b/‎auxx/cardano-sl-auxx.cabal
+2-1
diff --git a/‎auxx/src/Command/Tx.hs
+4-5 b/‎auxx/src/Command/Tx.hs
+4-5
diff --git a/‎auxx/src/Command/TyProjection.hs
+8-7 b/‎auxx/src/Command/TyProjection.hs
+8-7
diff --git a/‎auxx/src/Lang/DisplayError.hs
+1-1 b/‎auxx/src/Lang/DisplayError.hs
+1-1
diff --git a/‎auxx/src/Lang/Lexer.hs
+30-9 b/‎auxx/src/Lang/Lexer.hs
+30-9
diff --git a/‎auxx/src/Lang/Name.hs
+6-4 b/‎auxx/src/Lang/Name.hs
+6-4
diff --git a/‎auxx/src/Lang/Syntax.hs
+1-1 b/‎auxx/src/Lang/Syntax.hs
+1-1
diff --git a/‎auxx/src/Lang/Value.hs
+1-1 b/‎auxx/src/Lang/Value.hs
+1-1
@@ -0,0 +1,93 @@
+# HLint configuration file
+# https://github.com/ndmitchell/hlint
+##########################
+
+# This file contains a template configuration file, which is typically
+# placed as .hlint.yaml in the root of your project
+
+- arguments: [-XTypeApplications, --cpp-define=CONFIG=dev]
+
+- ignore: {name: Redundant do}
+- ignore: {name: Redundant bracket}
+- ignore: {name: Redundant $}
+- ignore: {name: Redundant flip}
+- ignore: {name: Move brackets to avoid $}
+- ignore: {name: Eta reduce}
+- ignore: {name: Avoid lambda}
+- ignore: {name: Use camelCase}
+- ignore: {name: Use const}
+- ignore: {name: Use if}
+- ignore: {name: Use notElem}
+- ignore: {name: Use fromMaybe}
+- ignore: {name: Use maybe}
+- ignore: {name: Use fmap}
+- ignore: {name: Use foldl}
+- ignore: {name: 'Use :'}
+- ignore: {name: Use ++}
+- ignore: {name: Use ||}
+- ignore: {name: Use &&}
+- ignore: {name: 'Use ?~'}
+- ignore: {name: Use <$>}
+- ignore: {name: Use .}
+- ignore: {name: Use head}
+- ignore: {name: Use String}
+- ignore: {name: Use Foldable.forM_}
+- ignore: {name: Unused LANGUAGE pragma}
+- ignore: {name: Use newtype instead of data}
+# Rules not found in old HLint.hs file (prior to HLint 2.0)
+# Added when we made the change.
+- ignore: {name: Redundant lambda}
+- ignore: {name: Use section}
+
+# Specify additional command line arguments
+#
+# - arguments: [--color, --cpp-simple, -XQuasiQuotes]
+
+
+# Control which extensions/flags/modules/functions can be used
+#
+# - extensions:
+#   - default: false # all extension are banned by default
+#   - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used
+#   - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module
+#
+# - flags:
+#   - {name: -w, within: []} # -w is allowed nowhere
+#
+# - modules:
+#   - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'
+#   - {name: Control.Arrow, within: []} # Certain modules are banned entirely
+#
+# - functions:
+#   - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules
+
+
+# Add custom hints for this project
+#
+# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"
+# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}
+
+
+# Turn on hints that are off by default
+#
+# Ban "module X(module X) where", to require a real export list
+# - warn: {name: Use explicit module export list}
+#
+# Replace a $ b $ c with a . b $ c
+# - group: {name: dollar, enabled: true}
+#
+# Generalise map to fmap, ++ to <>
+# - group: {name: generalise, enabled: true}
+
+
+# Ignore some builtin hints
+# - ignore: {name: Use let}
+# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
+
+
+# Define some custom infix operators
+# - fixity: infixr 3 ~^#^~
+
+
+# To generate a suitable file for HLint do:
+# $ hlint --default > .hlint.yaml
@@ -35,6 +35,18 @@ before_test:
       .\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -v info -c restore stack work --base-branch=develop
     }
 
+# Get custom GHC
+- ps: >-
+    mkdir C:\ghc
+
+    Invoke-WebRequest "https://s3.eu-central-1.amazonaws.com/ci-static/ghc-8.2.2-x86_64-unknown-mingw32.tar.xz" -OutFile "C:\ghc\ghc.tar.xz" -UserAgent "Curl"
+
+    7z x C:\ghc\ghc.tar.xz -oC:\ghc
+
+    7z x C:\ghc\ghc.tar -oC:\ghc
+
+    $env:PATH="$env:PATH;C:\ghc\ghc-8.2.2\bin"
+
 # Install OpenSSL 1.0.2 (see https://github.com/appveyor/ci/issues/1665)
 - ps: (New-Object Net.WebClient).DownloadFile('https://slproweb.com/download/Win64OpenSSL-1_0_2o.exe', "$($env:USERPROFILE)\Win64OpenSSL.exe")
 - ps: cmd /c start /wait "$($env:USERPROFILE)\Win64OpenSSL.exe" /silent /verysilent /sp- /suppressmsgboxes /DIR=C:\OpenSSL-Win64-v102
@@ -62,10 +74,11 @@ before_test:
 
 test_script:
   - cd "%WORK_DIR%"
-  - stack exec -- ghc-pkg recache
-  - stack --verbosity warn setup --no-reinstall > nul
+  - stack exec --system-ghc -- ghc-pkg recache
+  - stack --verbosity warn setup --system-ghc --no-reinstall > nul
   # Install happy separately: https://github.com/commercialhaskell/stack/issues/3151#issuecomment-310642487. Also install cpphs because it's a build-tool and Stack can't figure out by itself that it should be installed
   - scripts\ci\appveyor-retry call stack --verbosity warn install happy cpphs
+      --system-ghc
       -j 2
       --no-terminal
       --local-bin-path %SYSTEMROOT%\system32
@@ -81,6 +94,7 @@ test_script:
 # Retry transient failures due to https://github.com/haskell/cabal/issues/4005
   # We intentionally don't build auxx here, because this build is for installer.
   - scripts\ci\appveyor-retry call stack --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet cardano-sl-wallet-new
+      --system-ghc
       -j 2
       --no-terminal
       --local-bin-path %WORK_DIR%
 
@@ -3,9 +3,9 @@ module Main
        ) where
 
 import           Universum
-import           Unsafe (unsafeFromJust)
 
 import           Control.Exception.Safe (handle)
+import           Data.Maybe (fromMaybe)
 import           Formatting (sformat, shown, (%))
 import           Mockable (Production (..), runProduction)
 import qualified Network.Transport.TCP as TCP (TCPAddr (..))
@@ -111,8 +111,8 @@ action opts@AuxxOptions {..} command = do
                         { acRealModeContext = realModeContext
                         , acTempDbUsed = tempDbUsed }
                 lift $ runReaderT auxxAction auxxContext
-
-            vssSK = unsafeFromJust $ npUserSecret nodeParams ^. usVss
+            vssSK = fromMaybe (error "no user secret given")
+                              (npUserSecret nodeParams ^. usVss)
             sscParams = CLI.gtSscParams cArgs vssSK (npBehaviorConfig nodeParams)
 
         bracketNodeResources nodeParams sscParams txpGlobalSettings initNodeDBs $ \nr -> Production $
 
@@ -126,7 +126,8 @@ library
 
 executable cardano-auxx
   main-is:             Main.hs
-  build-depends:       cardano-sl
+  build-depends:       base
+                     , cardano-sl
                      , cardano-sl-auxx
                      , cardano-sl-block
                      , cardano-sl-core
 
@@ -23,11 +23,10 @@ import           Data.List ((!!))
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
-import           Data.Time.Units (toMicroseconds)
+import           Data.Time.Units (Microsecond, toMicroseconds, fromMicroseconds)
 import           Formatting (build, int, sformat, shown, stext, (%))
 import           Mockable (Mockable, SharedAtomic, SharedAtomicT, concurrently, currentTime, delay,
                            forConcurrently, modifySharedAtomic, newSharedAtomic)
-import           Serokell.Util (ms, sec)
 import           System.Environment (lookupEnv)
 import           System.IO (BufferMode (LineBuffering), hClose, hSetBuffering)
 import           System.Wlog (logError, logInfo)
@@ -98,7 +97,7 @@ sendToAllGenesis diffusion (SendToAllGenesisParams txsPerThread conc delay_ tpsS
         startAtTxt <- liftIO $ lookupEnv "AUXX_START_AT"
         let startAt = fromMaybe 0 . readMaybe . fromMaybe "" $ startAtTxt :: Int
         -- construct transaction output
-        outAddr <- makePubKeyAddressAuxx (toPublic (fromMaybe (error "sendToAllGenesis: no keys") $ head keysToSend))
+        outAddr <- makePubKeyAddressAuxx (toPublic (fromMaybe (error "sendToAllGenesis: no keys") $ (fmap fst . uncons) keysToSend))
         let txOut1 = TxOut {
                 txOutAddress = outAddr,
                 txOutValue = mkCoin 1
@@ -117,7 +116,7 @@ sendToAllGenesis diffusion (SendToAllGenesisParams txsPerThread conc delay_ tpsS
             -- every <slotDuration> seconds, write the number of sent transactions to a CSV file.
         let writeTPS :: m ()
             writeTPS = do
-                delay (sec genesisSlotDuration)
+                delay (fromMicroseconds . fromIntegral . (*) 1000000 $ genesisSlotDuration :: Microsecond)
                 curTime <- show . toInteger . getTimestamp . Timestamp <$> currentTime
                 finished <- modifySharedAtomic tpsMVar $ \(TxCount submitted sending) -> do
                     -- CSV is formatted like this:
@@ -142,7 +141,7 @@ sendToAllGenesis diffusion (SendToAllGenesisParams txsPerThread conc delay_ tpsS
                           logInfo $ if res
                                     then sformat ("Submitted transaction: "%txaF) tx
                                     else sformat ("Applied transaction "%txaF%", however no neighbour applied it") tx
-                          delay $ ms delay_
+                          delay $ (fromMicroseconds . fromIntegral . (*) 1000 $ delay_ :: Microsecond)
                           logInfo "Continuing to send transactions."
                           sendTxs (n - 1)
                       Nothing -> do
 
@@ -31,9 +31,8 @@ module Command.TyProjection
 import           Universum
 
 import           Data.Scientific (Scientific, floatingOrInteger, toBoundedInteger, toRealFloat)
-import           Data.Time.Units (TimeUnit, convertUnit)
+import           Data.Time.Units (TimeUnit, Microsecond, convertUnit, fromMicroseconds)
 import           Serokell.Data.Memory.Units (Byte, fromBytes)
-import           Serokell.Util (sec)
 
 import           Pos.Core (AddrStakeDistribution (..), Address, BlockVersion, Coin,
                            CoinPortion, EpochIndex, ScriptVersion, SoftwareVersion, StakeholderId,
@@ -93,8 +92,10 @@ tyByte = fromBytes <$> TyProjection "Byte" (sciToInteger <=< preview _ValueNumbe
 sciToInteger :: Scientific -> Maybe Integer
 sciToInteger = either (const Nothing) Just . floatingOrInteger @Double @Integer
 
-tySecond :: TimeUnit a => TyProjection a
-tySecond = convertUnit . sec <$> TyProjection "Second" (toBoundedInteger <=< preview _ValueNumber)
+tySecond :: forall a . TimeUnit a => TyProjection a
+tySecond =
+    convertUnit . (fromMicroseconds . fromIntegral . (*) 1000000 :: Int -> Microsecond) <$>
+    TyProjection "Second" (toBoundedInteger <=< preview _ValueNumber)
 
 tyScriptVersion :: TyProjection ScriptVersion
 tyScriptVersion = TyProjection "ScriptVersion" (toBoundedInteger <=< preview _ValueNumber)
@@ -149,10 +150,10 @@ tyProposeUpdateSystem :: TyProjection ProposeUpdateSystem
 tyProposeUpdateSystem = TyProjection "ProposeUpdateSystem" (preview _ValueProposeUpdateSystem)
 
 tySystemTag :: TyProjection SystemTag
-tySystemTag = TyProjection "SystemTag" ((fmap . fmap) (SystemTag . fromString) (preview _ValueString))
+tySystemTag = TyProjection "SystemTag" ((fmap . fmap) (SystemTag) (preview _ValueString))
 
 tyApplicationName :: TyProjection ApplicationName
-tyApplicationName = TyProjection "ApplicationName" ((fmap . fmap) (ApplicationName . fromString) (preview _ValueString))
+tyApplicationName = TyProjection "ApplicationName" ((fmap . fmap) (ApplicationName) (preview _ValueString))
 
-tyString :: TyProjection String
+tyString :: TyProjection Text
 tyString = TyProjection "String" (preview _ValueString)
@@ -104,7 +104,7 @@ ppParseError (ParseError str (Report {..})) =
   <+> hcat (punctuate (text ", or ") $ map text expected)
   <$> renderLines
   where
-    unconsumedDesc = maybe "end of input" show . head . fmap snd $ unconsumed
+    unconsumedDesc = maybe "end of input" show . (fmap fst . uncons) . fmap snd $ unconsumed
     strLines = nonEmpty $ take spanLines . drop (spanLineStart - 1) $ lines str
     renderLines = case strLines of
         Nothing ->
 
@@ -24,9 +24,10 @@ module Lang.Lexer
        , tokenize
        , tokenize'
        , detokenize
+       , tokenRender
        ) where
 
-import           Universum
+import           Universum hiding (try)
 
 import qualified Control.Applicative.Combinators.NonEmpty as NonEmpty
 import           Control.Lens (makePrisms)
@@ -45,7 +46,7 @@ import           Text.Megaparsec (Parsec, SourcePos (..), between, choice, eof,
                                   manyTill, notFollowedBy, parseMaybe, skipMany, takeP, takeWhile1P,
                                   try, unPos, (<?>))
 import           Text.Megaparsec.Char (anyChar, char, satisfy, spaceChar, string)
-import           Text.Megaparsec.Char.Lexer (charLiteral, decimal, scientific, signed)
+import           Text.Megaparsec.Char.Lexer (decimal, scientific, signed)
 
 import           Lang.Name (Letter, Name (..), unsafeMkLetter)
 import           Pos.Arbitrary.Core ()
@@ -98,7 +99,7 @@ isFilePathChar c = isAlphaNum c || c `elem` ['.', '/', '-', '_']
 data Token
     = TokenSquareBracket BracketSide
     | TokenParenthesis BracketSide
-    | TokenString String
+    | TokenString Text
     | TokenNumber Scientific
     | TokenAddress Address
     | TokenPublicKey PublicKey
@@ -124,7 +125,14 @@ tokenRender :: Token -> Text
 tokenRender = \case
     TokenSquareBracket bs -> withBracketSide "[" "]" bs
     TokenParenthesis bs -> withBracketSide "(" ")" bs
-    TokenString s -> show s
+    -- Double up every double quote, and surround the whole thing with double
+    -- quotes.
+    TokenString t -> quote (escapeQuotes t)
+      where
+        quote :: Text -> Text
+        quote t' = Text.concat [Text.singleton '\"', t', Text.singleton '\"']
+        escapeQuotes :: Text -> Text
+        escapeQuotes = Text.intercalate "\"\"" . Text.splitOn "\""
     TokenNumber n -> show n
     TokenAddress a -> pretty a
     TokenPublicKey pk -> sformat fullPublicKeyF pk
@@ -186,7 +194,7 @@ pToken' = choice
     , string "~software~" *> (TokenSoftwareVersion <$> try pSoftwareVersion)
     , marking "filepath" $ TokenFilePath <$> pFilePath
     , marking "num" $ TokenNumber <$> pScientific
-    , marking "str" $ TokenString <$> pString
+    , marking "str" $ TokenString <$> pText
     , marking "ident" $ pIdent
     ] <?> "token"
 
@@ -200,10 +208,21 @@ pPunct = choice
     , char ';' $> TokenSemicolon
     ] <?> "punct"
 
-pString :: Lexer String
-pString =
-    char '\"' *>
-    manyTill (charLiteral <|> anyChar) (char '\"')
+pText :: Lexer Text
+pText = do
+    _ <- char '\"'
+    Text.pack <$> loop []
+  where
+    loop :: [Char] -> Lexer [Char]
+    loop !acc = do
+        next <- anyChar
+        case next of
+            -- Check for double double quotes. If it's a single double quote,
+            -- it's the end of the string.
+            '\"' -> try (doubleQuote acc) <|> pure (reverse acc)
+            c    -> loop (c : acc)
+    doubleQuote :: [Char] -> Lexer [Char]
+    doubleQuote !acc = char '\"' >> loop ('\"' : acc)
 
 pSomeAlphaNum :: Lexer Text
 pSomeAlphaNum = takeWhile1P (Just "alphanumeric") isAlphaNum
@@ -281,3 +300,5 @@ pScientific = do
     n <- signed (return ()) scientific
     p <- isJust <$> optional (char '%')
     return $ if p then n / 100 else n
+
+{-# ANN module ("HLint: ignore Use toText" :: Text) #-}
@@ -13,8 +13,8 @@ import           Data.Coerce (coerce)
 import qualified Data.List.NonEmpty as NonEmpty
 import           Data.List.Split (splitWhen)
 import qualified Data.Text.Buildable as Buildable
-import           Test.QuickCheck.Arbitrary.Generic (Arbitrary (..), genericArbitrary, genericShrink)
-import           Test.QuickCheck.Gen (suchThat)
+import           Test.QuickCheck.Arbitrary.Generic (Arbitrary (..))
+import           Test.QuickCheck.Gen (Gen, suchThat, listOf)
 
 -- | Invariant: @isAlpha . getLetter = const True@
 newtype Letter = Letter { getLetter :: Char }
@@ -33,8 +33,10 @@ unsafeMkName :: [String] -> Name
 unsafeMkName = coerce . fmap NonEmpty.fromList . NonEmpty.fromList
 
 instance Arbitrary Name where
-    arbitrary = genericArbitrary
-    shrink = genericShrink
+    arbitrary = Name <$> neList (neList arbitrary)
+      where
+        neList :: Gen a -> Gen (NonEmpty a)
+        neList gen = (:|) <$> gen <*> listOf gen
 
 instance Buildable Name where
     build
 
@@ -29,7 +29,7 @@ deriving instance Show cmd => Show (Expr cmd)
 
 data Lit
     = LitNumber Scientific
-    | LitString String
+    | LitString Text
     | LitAddress Address
     | LitPublicKey PublicKey
     | LitStakeholderId StakeholderId
 
@@ -86,7 +86,7 @@ data AddKeyParams = AddKeyParams
 data Value
     = ValueUnit
     | ValueNumber Scientific
-    | ValueString String
+    | ValueString Text
     | ValueBool Bool
     | ValueList [Value]
     | ValueAddress Address