Trivial stylish-haskell reformat.

[?]
Oct 29, 2016, 8:34 PM
NAS4BFL43SIUAAC663R6VFBHQ2DKI45K6Y6ZKVQI7S5547HBAN7QC

Dependencies

  • [2] 7VGYLTMU Clean up schema version handling.
  • [3] 75N3UJ4J More progression toward lenses.
  • [4] 4U7F3CPI THE GREAT RENAMING OF THINGS!
  • [5] NEDDHXUK Reformat via stylish-haskell
  • [6] O5FVTOM6 Undo JSON silliness, enable a couple more routes.
  • [7] NLZ3JXLO Fix formatting with stylish-haskell.
  • [8] HBULCDN6 Add tests for auction winner determination algorithm.
  • [9] EZQG2APB Update task list.
  • [10] NVOCQVAS Initial failing tests.
  • [11] QMRKFEPG Refactor QDB to use a free monad algebra instead.
  • [12] Z7KS5XHH Very WIP. Wow.
  • [13] 3QVT6MA6 Add database support for event amend operations.
  • [14] SCXG6TJW Make log reduction safer in presence of overlapping events.
  • [15] W35DDBFY Factor common JSON conversions up into client lib module.
  • [16] 5OI44E4E Add authentication to auction search.
  • [17] O722AOKE Add route to allow crediting of events to users/projects.
  • [18] I2KHGVD4 Require project permissions for access to most data.
  • [19] FXJQACES Ensure that auction is not ended at the time of bid
  • [20] POX3UAMT Enabling logging of time to contributor/project accounts
  • [21] GCVQD44V Create amends endpoint, switch to UUID primary keys
  • [22] PBD7LZYQ Postgres & auth are beginning to function.
  • [23] BROSTG5K Beginning of modularization of server.
  • [24] 7KZP4RHZ Switch from Data.Time to Data.Thyme
  • [25] LHJ2HFXV Add property test for auction algorithm.
  • [26] UILI6PIL The route-based logStart/logStop is nicer.
  • [27] HALRDT2F Added initial auction create route.
  • [28] A6HKMINB Attempting to improve JSON handling.
  • [29] RN7EI6IN Update database layer to use CreditTo
  • [30] LAROLAYU WIP
  • [31] ZP62WC47 Begin conversion to build with stack.
  • [32] IZEVQF62 Work in progress replacing sqlite with postgres.
  • [33] RPAJLHMT Change to use UUIDs instead of ints for primary keys.
  • [34] EKI57EJR Add alternative implementation of auction winner determination.
  • [35] EMVTF2IW WIP moving back to snap.
  • [36] Z3MK2PJ5 Add GET handler for retrieving auction data.
  • [37] WO2MINIF Auctions now compile!
  • [38] TLQ72DSJ Lenses, sqlite-simple
  • [39] ASF3UPJL Add auction creation and bid handlers
  • [40] 2G3GNDDU Event logging is now functioning in postgres.
  • [41] BWN72T44 Don't accept work timestamp from an external source.
  • [42] KEP5WUFJ Convert project to stack-based build.
  • [*] 64C6AWH6 Rename Ananke -> Quixotic, project reboot.
  • [*] ADMKQQGC Initial empty Snap project.

Change contents

  • replacement in lib/Aftok/Auction.hs at line 9
    [3.96][3.17:57](),[3.57][3.3:41](),[3.135][3.3:41]()
    import Data.Thyme.Clock as C
    import Data.Thyme.Format ()
    [3.96]
    [3.135]
    import Data.Thyme.Clock as C
    import Data.Thyme.Format ()
  • replacement in lib/Aftok/Auction.hs at line 13
    [3.27][3.53:85](),[3.85][3.3:46](),[3.46][3.85:128](),[3.85][3.85:128]()
    import Aftok (UserId)
    import Aftok.Project (ProjectId)
    import Aftok.Types (Satoshi(..))
    [3.27]
    [3.5213]
    import Aftok (UserId)
    import Aftok.Project (ProjectId)
    import Aftok.Types (Satoshi (..))
  • replacement in lib/Aftok/Auction.hs at line 21
    [3.239][3.47:106]()
    { _projectId :: ProjectId
    , _initiator :: UserId
    [3.239]
    [3.69]
    { _projectId :: ProjectId
    , _initiator :: UserId
  • replacement in lib/Aftok/Auction.hs at line 24
    [3.102][3.102:131]()
    , _raiseAmount :: Satoshi
    [3.102]
    [3.131]
    , _raiseAmount :: Satoshi
  • replacement in lib/Aftok/Auction.hs at line 26
    [3.164][3.158:189](),[3.158][3.158:189]()
    , _auctionEnd :: C.UTCTime
    [3.164]
    [3.5319]
    , _auctionEnd :: C.UTCTime
  • replacement in lib/Aftok/Auction.hs at line 42
    [3.219][3.219:239]()
    { _baseBid :: Bid
    [3.219]
    [3.239]
    { _baseBid :: Bid
  • replacement in lib/Aftok/Auction.hs at line 44
    [3.273][3.273:306]()
    , _commitmentAmount :: Satoshi
    [3.273]
    [3.306]
    , _commitmentAmount :: Satoshi
  • replacement in lib/Aftok/Auction.hs at line 99
    [3.551][3.551:588]()
    put (x + bid ^. bidAmount) >>
    [3.551]
    [3.588]
    put (x + bid ^. bidAmount) >>
  • replacement in lib/Aftok/Auction.hs at line 110
    [3.1075][3.1075:1094]()
    -- otherwise,
    [3.1075]
    [3.1094]
    -- otherwise,
  • replacement in lib/Aftok/Database/PostgreSQL.hs at line 22
    [3.1583][3.167:203]()
    import Aftok.Auction as A
    [3.1583]
    [3.1614]
    import Aftok.Auction as A
  • replacement in lib/Aftok/Database/PostgreSQL.hs at line 25
    [3.1678][3.204:240]()
    import Aftok.Project as P
    [3.1678]
    [3.1678]
    import Aftok.Project as P
  • replacement in lib/Aftok/Database/PostgreSQL.hs at line 88
    [3.1043][3.1043:1086]()
    parser tname = pure $ case tname of
    [3.1043]
    [3.1086]
    parser tname = pure $ case tname of
  • replacement in lib/Aftok/Database/PostgreSQL.hs at line 96
    [3.1480][3.1480:1528]()
    _ -> conversionError $
    Incompatible
    [3.1480]
    [3.1528]
    _ -> conversionError $
    Incompatible
  • replacement in lib/Aftok/Database/PostgreSQL.hs at line 104
    [3.1679][3.1679:1682]()
    [3.1679]
    [3.1682]
  • replacement in lib/Aftok/Database/PostgreSQL.hs at line 186
    [3.75][3.75:121]()
    case c of
    CreditToAddress addr ->
    [3.75]
    [3.121]
    case c of
    CreditToAddress addr ->
  • replacement in lib/Aftok/Database/PostgreSQL.hs at line 258
    [3.1933][3.1933:1960]()
    CreditToUser uid ->
    [3.1933]
    [3.2985]
    CreditToUser uid ->
  • replacement in lib/Aftok/Database.hs at line 13
    [3.270][3.698:770]()
    import Aftok.Project as P
    import Aftok.Auction as A
    [3.270]
    [3.301]
    import Aftok.Auction as A
  • edit in lib/Aftok/Database.hs at line 15
    [3.333]
    [3.333]
    import Aftok.Project as P
  • replacement in lib/Aftok/Database.hs at line 171
    [3.828][3.828:851]()
    findAuction aid uid =
    [3.828]
    [3.147]
    findAuction aid uid =
  • replacement in lib/Aftok/Database.hs at line 179
    [3.347][3.347:371]()
    findAuction' aid uid =
    [3.347]
    [3.371]
    findAuction' aid uid =
  • replacement in lib/Aftok/Database.hs at line 187
    [3.80][3.583:608]()
    createBid aid uid bid =
    [3.80]
    [3.141]
    createBid aid uid bid =
  • replacement in lib/Aftok/Database.hs at line 191
    [3.650][3.650:702]()
    fc $ if view bidTime bid > view auctionEnd auc
    [3.650]
    [3.702]
    fc $ if view bidTime bid > view auctionEnd auc
  • edit in lib/Aftok/Json.hs at line 2
    [3.3609]
    [3.881]
    {-# LANGUAGE ExplicitForAll #-}
  • edit in lib/Aftok/Json.hs at line 15
    [3.1159]
    [3.1159]
    import Data.HashMap.Strict as O
  • edit in lib/Aftok/Json.hs at line 18
    [3.1270][3.735:790]()
    import Data.HashMap.Strict as O
  • replacement in lib/Aftok/Json.hs at line 156
    [3.1833][3.1626:1665]()
    logEntryJSON (LogEntry c ev m) = v2 $
    [3.1833]
    [2.2236]
    logEntryJSON (LogEntry c ev m) = v2 $
  • replacement in lib/Aftok/Json.hs at line 171
    [2.2423][2.2423:2471]()
    parseCreditTo = unversion "CreditTo" $ p where
    [2.2423]
    [2.2471]
    parseCreditTo = unversion "CreditTo" $ p where
  • replacement in lib/Aftok/Json.hs at line 176
    [2.2596][2.2596:2642]()
    parseCreditToV1 :: Object -> Parser CreditTo
    [2.2596]
    [2.2642]
    parseCreditToV1 :: Object -> Parser CreditTo
  • replacement in lib/Aftok/Json.hs at line 180
    [2.2768][2.2768:2819]()
    parseCreditToV2 o =
    let parseCreditToAddr o' =
    [2.2768]
    [2.2819]
    parseCreditToV2 o =
    let parseCreditToAddr o' =
  • replacement in lib/Aftok/Json.hs at line 184
    [2.2902][2.2902:2932]()
    parseCreditToUser o' =
    [2.2902]
    [2.2932]
    parseCreditToUser o' =
  • replacement in lib/Aftok/Json.hs at line 187
    [2.3013][2.3013:3046]()
    parseCreditToProject o' =
    [2.3013]
    [2.3046]
    parseCreditToProject o' =
  • replacement in lib/Aftok/Json.hs at line 199
    [2.3539][2.3539:3563]()
    p (Version 2 0) v =
    [2.3539]
    [2.3563]
    p (Version 2 0) v =
  • replacement in lib/Aftok/Json.hs at line 217
    [3.4481][2.4293:4328]()
    in o .: "amendment" >>= parseA
    [3.4481]
    [3.2512]
    in o .: "amendment" >>= parseA
  • replacement in lib/Aftok/Json.hs at line 226
    [3.4591][2.4638:4673]()
    in o .: "amendment" >>= parseA
    [3.4591]
    [3.2983]
    in o .: "amendment" >>= parseA
  • replacement in lib/Aftok/Json.hs at line 239
    [3.87][2.4674:4722]()
    parseLogEntry f = unversion "LogEntry" p where
    [3.87]
    [2.4722]
    parseLogEntry f = unversion "LogEntry" p where
  • replacement in lib/Aftok/Project.hs at line 1
    [3.1031][3.1032:1068]()
    {-# LANGUAGE TemplateHaskell #-}
    [3.1031]
    [3.1068]
    {-# LANGUAGE TemplateHaskell #-}
  • replacement in lib/Aftok/TimeLog.hs at line 36
    [3.4695][3.4518:4561]()
    import Aftok.Project (ProjectId)
    [3.4695]
    [3.1224]
    import Aftok.Project (ProjectId)
  • replacement in lib/Aftok/TimeLog.hs at line 58
    [3.4563][3.4563:4578]()
    data CreditTo
    [3.4563]
    [3.4578]
    data CreditTo
  • replacement in lib/Aftok/TimeLog.hs at line 60
    [3.4662][3.4662:4691]()
    = CreditToAddress BtcAddr
    [3.4662]
    [3.4691]
    = CreditToAddress BtcAddr
  • replacement in lib/Aftok/TimeLog.hs at line 63
    [3.4786][3.4786:4847]()
    -- payouts are distributed to this project's contributors
    [3.4786]
    [3.4847]
    -- payouts are distributed to this project's contributors
  • replacement in lib/Aftok/Types.hs at line 2
    [3.850][3.784:817]()
    {-# LANGUAGE TemplateHaskell #-}
    [3.850]
    [3.850]
    {-# LANGUAGE TemplateHaskell #-}
  • replacement in lib/Aftok.hs at line 9
    [3.2690][3.5837:5906]()
    import Control.Lens (makeLenses, makePrisms)
    [3.2690]
    [3.5906]
    import Control.Lens (makeLenses, makePrisms)
  • replacement in server/Aftok/Snaplet/Auctions.hs at line 13
    [3.2636][3.609:661](),[3.661][3.2636:2677](),[3.2636][3.2636:2677]()
    import Data.Hourglass.Types (Seconds(..))
    import Data.Thyme.Clock as C
    [3.2636]
    [3.2723]
    import Data.Hourglass.Types (Seconds (..))
    import Data.Thyme.Clock as C
  • replacement in server/Aftok/Snaplet/Auctions.hs at line 16
    [3.2724][3.662:860]()
    import Aftok (UserId)
    import Aftok.Auction (AuctionId, Auction(..), BidId, Bid(..))
    import Aftok.Database (createAuction, findAuction, createBid)
    [3.2724]
    [3.2837]
    import Aftok (UserId)
    import Aftok.Auction (Auction (..), AuctionId, Bid (..), BidId)
    import Aftok.Database (createAuction, createBid, findAuction)
  • replacement in server/Aftok/Snaplet/Auth.hs at line 10
    [3.7824][3.1233:1293]()
    import Aftok.Auction (AuctionId(..))
    [3.7824]
    [3.7824]
    import Aftok.Auction (AuctionId (..))
  • edit in server/Aftok/Snaplet/Auth.hs at line 12
    [3.7856][3.7856:7887]()
    import Aftok.Snaplet
  • edit in server/Aftok/Snaplet/Auth.hs at line 13
    [3.3758]
    [3.7887]
    import Aftok.Snaplet
  • replacement in server/Aftok/Snaplet/Projects.hs at line 4
    [3.2398][3.3760:3791]()
    module Aftok.Snaplet.Projects
    [3.2398]
    [3.3791]
    module Aftok.Snaplet.Projects
  • replacement in server/Aftok/Snaplet/WorkLog.hs at line 11
    [3.5642][3.1064:1102]()
    import Aftok (parseBtcAddr)
    [3.5642]
    [3.9836]
    import Aftok (parseBtcAddr)
  • edit in server/Main.hs at line 13
    [3.11453][3.11453:11489]()
    import Aftok.Snaplet.Auth
  • edit in server/Main.hs at line 14
    [3.4162]
    [3.11489]
    import Aftok.Snaplet.Auth