stylish-haskell reformatting

[?]

Jan 21, 2017, 10:03 PM

Q5X5RYQLP5K7REYD6VLHOKC4W36ZELJYA45V6YFKTD5S6MPN3NDQC

Dependencies

[2] WAIX6AGN Add event serialization for PaymentRequest & Payment
[3] PBD7LZYQ Postgres & auth are beginning to function.
[4] QMRKFEPG Refactor QDB to use a free monad algebra instead.
[5] 2XQD6KKK Add invitation logic and clean up DBProg error handling.
[6] Z3MK2PJ5 Add GET handler for retrieving auction data.
[7] XTBSG4C7 Adding serveJSON combinator to eliminate some boilerplate from handlers.
[8] NAS4BFL4 Trivial stylish-haskell reformat.
[9] 75N3UJ4J More progression toward lenses.
[10] 73NDXDEZ Begin implementation of billing event persistence.
[11] NLZ3JXLO Fix formatting with stylish-haskell.
[12] QADKFHAR Adds CreatePayment handler implementation.
[13] KEP5WUFJ Convert project to stack-based build.
[14] HALRDT2F Added initial auction create route.
[15] DFOBMSAO Initial work on payments API
[16] O227CEAV Adds storage of original event JSON for some DBOp constructors.
[17] BWN72T44 Don't accept work timestamp from an external source.
[18] 5ZSKPQ3K Add created_at and auction_start timestamps to auction
[19] EZQG2APB Update task list.
[20] W35DDBFY Factor common JSON conversions up into client lib module.
[21] 7DBNV3GV Initial, stack-based impl of time log event reduction.
[22] RN7EI6IN Update database layer to use CreditTo
[23] 7VGYLTMU Clean up schema version handling.
[24] NVOCQVAS Initial failing tests.
[25] POX3UAMT Enabling logging of time to contributor/project accounts
[26] WO2MINIF Auctions now compile!
[27] NEDDHXUK Reformat via stylish-haskell
[28] Y3LIJ5US Add handler for CreatePaymentRequest
[29] N4NDAZYT Initial implementation of payouts.
[30] Z7KS5XHH Very WIP. Wow.
[31] EMVTF2IW WIP moving back to snap.
[32] IZEVQF62 Work in progress replacing sqlite with postgres.
[33] Y35QCWYW Minor improvement in WorkIndex type to eliminate duplicated information.
[34] A6HKMINB Attempting to improve JSON handling.
[35] GCVQD44V Create amends endpoint, switch to UUID primary keys
[36] O5FVTOM6 Undo JSON silliness, enable a couple more routes.
[37] SCXG6TJW Make log reduction safer in presence of overlapping events.
[*] 64C6AWH6 Rename Ananke -> Quixotic, project reboot.
[*] EQXRXRZD Changed to use tasty instead of test-framework

Change contents

replacement in lib/Aftok/Billables.hs at line 7

[3.857]→[3.3:72](∅→∅)

import Control.Lens (makeLenses, makePrisms)

[3.857]

[3.914]

import Control.Lens (makeLenses, makePrisms)
replacement in lib/Aftok/Billables.hs at line 9

[3.915]→[3.915:981](∅→∅)

import Data.UUID
import Aftok.Time (Days(..))

[3.915]

[3.73]

import Aftok (UserId)
replacement in lib/Aftok/Billables.hs at line 11

[3.116]→[3.116:187](∅→∅)

import Aftok (UserId)
import Aftok.Types (Satoshi)

[3.116]

[3.981]

import Aftok.Time (Days (..))
import Aftok.Types (Satoshi)
import Data.UUID
replacement in lib/Aftok/Billables.hs at line 23

[3.1221]→[3.1221:1236](∅→∅)

| OneTime

[3.1124]

[3.1236]

| OneTime
replacement in lib/Aftok/Billables.hs at line 27

[3.267]→[3.267:305](∅→∅)

recurrenceName Annually = "annually"

[3.267]

[3.305]

recurrenceName Annually = "annually"
replacement in lib/Aftok/Billables.hs at line 31

[3.425]→[3.425:462](∅→∅)

recurrenceName OneTime = "onetime"

[3.425]

[3.462]

recurrenceName OneTime = "onetime"
replacement in lib/Aftok/Billables.hs at line 34

[3.506]→[3.506:541](∅→∅)

recurrenceCount Annually = Nothing

[3.506]

[3.541]

recurrenceCount Annually = Nothing
replacement in lib/Aftok/Billables.hs at line 38

[3.653]→[3.653:688](∅→∅)

recurrenceCount OneTime = Nothing

[3.653]

[3.688]

recurrenceCount OneTime = Nothing
replacement in lib/Aftok/Billables.hs at line 41

[3.742]→[3.1304:1322](∅→∅),[3.1304]→[3.1304:1322](∅→∅),[3.1322]→[3.743:761](∅→∅),[3.761]→[3.1322:1340](∅→∅),[3.1322]→[3.1322:1340](∅→∅)

{ _project :: p
, _creator :: u
, _name :: Text

[3.742]

[3.1340]

{ _project :: p
, _creator :: u
, _name :: Text
replacement in lib/Aftok/Billables.hs at line 45

[3.1365]→[3.1365:1412](∅→∅)

, _recurrence :: Recurrence
, _amount :: c

[3.1365]

[3.1412]

, _recurrence :: Recurrence
, _amount :: c
replacement in lib/Aftok/Database/PostgreSQL.hs at line 9

[3.1043]→[3.4:74](∅→∅)

import Data.Aeson (toJSON, Value)

[3.1043]

[3.1106]

import Data.Aeson (Value, toJSON)
replacement in lib/Aftok/Database/PostgreSQL.hs at line 13

[3.1256]→[3.65:109](∅→∅)

import Data.ProtocolBuffers (encodeMessage)

[3.1256]

[3.109]

import Data.ProtocolBuffers (encodeMessage)
replacement in lib/Aftok/Database/PostgreSQL.hs at line 23

[3.1829]→[3.1829:1884](∅→∅)

import Network.Haskoin.Crypto (addrToBase58)

[3.1829]

[3.1011]

import Network.Haskoin.Crypto (addrToBase58)
replacement in lib/Aftok/Database/PostgreSQL.hs at line 30

[3.1678]→[2.4:124](∅→∅)

import Aftok.Json (billableJSON, subscriptionJSON, paymentRequestJSON, paymentJSON)

[3.1678]

[3.173]

import Aftok.Json (billableJSON,
paymentJSON,
paymentRequestJSON,
subscriptionJSON)
replacement in lib/Aftok/Database/PostgreSQL.hs at line 36

[3.1267]→[3.1267:1339](∅→∅)

import Aftok.Time (Days(..), _Days)

[3.1267]

[3.1678]

import Aftok.Time (Days (..), _Days)
replacement in lib/Aftok/Database/PostgreSQL.hs at line 87

[3.1533]→[3.1533:1632](∅→∅)

prec "annually" = nullField *> pure BI.Annually
prec "monthly" = BI.Monthly <$> field

[3.1533]

[3.1632]

prec "annually" = nullField *> pure BI.Annually
prec "monthly" = BI.Monthly <$> field
replacement in lib/Aftok/Database/PostgreSQL.hs at line 90

[3.1692]→[3.1692:1810](∅→∅)

prec "weekly" = BI.Weekly <$> field
prec "onetime" = nullField *> pure BI.OneTime
prec _ = empty

[3.1692]

[3.1810]

prec "weekly" = BI.Weekly <$> field
prec "onetime" = nullField *> pure BI.OneTime
prec _ = empty
replacement in lib/Aftok/Database/PostgreSQL.hs at line 106

[3.346]→[3.346:371](∅→∅)

creditToParser' f v =

[3.346]

[3.2050]

creditToParser' f v =
replacement in lib/Aftok/Database/PostgreSQL.hs at line 114

[3.2461]→[3.2461:2489](∅→∅)

if tn /= "credit_to_t"

[3.2461]

[3.2489]

if tn /= "credit_to_t"
replacement in lib/Aftok/Database/PostgreSQL.hs at line 209

[3.3794]→[3.163:200](∅→∅)

storeEvent (CreateBillable uid b) =

[3.3794]

[3.200]

storeEvent (CreateBillable uid b) =
replacement in lib/Aftok/Database/PostgreSQL.hs at line 212

[3.264]→[3.264:307](∅→∅)

storeEvent (CreateSubscription uid bid) =

[3.264]

[3.307]

storeEvent (CreateSubscription uid bid) =
replacement in lib/Aftok/Database/PostgreSQL.hs at line 215

[3.385]→[2.125:170](∅→∅)

storeEvent (CreatePaymentRequest uid req) =

[3.385]

[2.170]

storeEvent (CreatePaymentRequest uid req) =
replacement in lib/Aftok/Database/PostgreSQL.hs at line 218

[2.249]→[2.249:287](∅→∅)

storeEvent (CreatePayment uid req) =

[2.249]

[2.287]

storeEvent (CreatePayment uid req) =
replacement in lib/Aftok/Database/PostgreSQL.hs at line 467

[3.1093]→[3.1093:1120](∅→∅)

, eventId ^. _EventId

[3.1093]

[3.1120]

, eventId ^. _EventId
replacement in lib/Aftok/Database/PostgreSQL.hs at line 470

[3.1186]→[3.1186:1189](∅→∅)

[3.1186]

[3.955]
replacement in lib/Aftok/Database.hs at line 178

[3.1261]→[3.1261:1285](∅→∅)

createBillable uid b =

[3.1261]

[3.1285]

createBillable uid b =
edit in lib/Aftok/Database.hs at line 187

[3.4784]→[3.4784:4787](∅→∅)
edit in lib/Aftok/Database.hs at line 188

[3.4788]

[3.466]
replacement in lib/Aftok/Interval.hs at line 48

[3.3543]→[3.3543:3571](∅→∅)

parseIntervalJSON _ = mzero

[3.3543]

parseIntervalJSON _ = mzero
edit in lib/Aftok/Json.hs at line 13

[3.59]→[3.1077:1132](∅→∅),[3.3725]→[3.1077:1132](∅→∅)

import qualified Data.ByteString.Char8 as C
replacement in lib/Aftok/Json.hs at line 14

[2.410]→[2.410:454](∅→∅)

import Data.ProtocolBuffers (encodeMessage)

[2.410]

[3.1132]

import qualified Data.ByteString.Char8 as C
replacement in lib/Aftok/Json.hs at line 19

[3.1270]→[2.455:518](∅→∅)

import Data.Serialize.Put (runPut)

[3.1270]

[3.4970]

import Data.ProtocolBuffers (encodeMessage)
import Data.Serialize.Put (runPut)
replacement in lib/Aftok/Json.hs at line 34

[3.201]→[3.5026:5069](∅→∅)

import Aftok.Util (traverseKeys)

[3.201]

[3.272]

import Aftok.Util (traverseKeys)
replacement in lib/Aftok/Json.hs at line 88

[3.1001]→[3.1001:1031](∅→∅)

p ver = badVersion name ver

[3.1001]

[3.939]

p ver = badVersion name ver
replacement in lib/Aftok/Json.hs at line 189

[3.2289]→[3.2289:2322](∅→∅)

subscriptionJSON uid bid = v1 $

[3.2289]

[3.2322]

subscriptionJSON uid bid = v1 $
replacement in lib/Aftok/Json.hs at line 240

[3.3443]→[3.5278:5301](∅→∅)

p (Version 1 _) v =

[3.3443]

[3.5301]

p (Version 1 _) v =
replacement in lib/Aftok/Json.hs at line 242

[3.5347]→[3.5347:5512](∅→∅)

parseKey k = maybe
(fail $ "Key " <> k <> " cannot be parsed as a valid BTC address.")
(pure . CreditToAddress)

[3.5347]

[3.5512]

parseKey k = maybe
(fail $ "Key " <> k <> " cannot be parsed as a valid BTC address.")
(pure . CreditToAddress)
replacement in lib/Aftok/Json.hs at line 247

[3.5633]→[3.5633:5638](∅→∅)

[3.5633]

[3.1305]
replacement in lib/Aftok/Json.hs at line 252

[3.5640]→[3.5640:5653](∅→∅)

p ver x =

[3.5640]

[3.5653]

p ver x =
replacement in lib/Aftok/Json.hs at line 259

[3.3941]→[3.3941:3983](∅→∅)

p ver = badVersion "EventAmendment" ver

[3.3941]

[3.1956]

p ver = badVersion "EventAmendment" ver
replacement in lib/Aftok/Payments.hs at line 7

[3.5782]→[3.517:586](∅→∅)

import Control.Lens (makeLenses, makePrisms)

[3.5782]

[3.5839]

import Control.Lens (makeLenses, makePrisms)
replacement in lib/Aftok/Payments.hs at line 9

[3.5840]→[3.5840:5889](∅→∅)

import Data.Thyme.Clock as C

[3.5840]

[3.5889]

import Data.Thyme.Clock as C
replacement in lib/Aftok/Payments.hs at line 14

[3.5960]→[3.587:610](∅→∅)

import Aftok.Billables

[3.5960]

[3.610]

import Aftok.Billables
replacement in lib/Aftok/Payments.hs at line 23

[3.714]→[3.13944:13967](∅→∅),[2.1303]→[3.13944:13967](∅→∅),[3.13944]→[3.13944:13967](∅→∅),[3.13967]→[3.6159:6199](∅→∅),[3.6159]→[3.6159:6199](∅→∅)

{ _subscription :: s
, _paymentRequest :: P.PaymentRequest

[2.1303]

[3.6199]

{ _subscription :: s
, _paymentRequest :: P.PaymentRequest
replacement in lib/Aftok/Payments.hs at line 32

[3.832]→[3.6315:6359](∅→∅),[2.1330]→[3.6315:6359](∅→∅),[3.14000]→[3.6315:6359](∅→∅),[3.6315]→[3.6315:6359](∅→∅)

{ _request :: r
, _payment :: P.Payment

[2.1330]

[3.6359]

{ _request :: r
, _payment :: P.Payment
replacement in lib/Aftok/Payments.hs at line 38

[3.856]→[3.856:898](∅→∅)

type Payment = Payment' PaymentRequestId

[3.856]

type Payment = Payment' PaymentRequestId
replacement in lib/Aftok/Time.hs at line 5

[3.6530]→[3.14036:14093](∅→∅)

import Control.Lens (makePrisms)

[3.6530]

[3.6530]

import Control.Lens (makePrisms)
replacement in lib/Aftok/TimeLog.hs at line 70

[3.5337]→[3.5337:5386](∅→∅)

creditToName (CreditToUser _) = "credit_to_user"

[3.5337]

[3.5386]

creditToName (CreditToUser _) = "credit_to_user"
replacement in lib/Aftok/Types.hs at line 8

[3.848]→[3.6639:6690](∅→∅)

import Network.Bippy.Types (Satoshi(..))

[3.848]

[3.915]

import Network.Bippy.Types (Satoshi (..))
replacement in lib/Aftok/Types.hs at line 10

[3.916]→[3.6691:6724](∅→∅)

satoshi :: Lens' Satoshi Word64

[3.916]

[3.6724]

satoshi :: Lens' Satoshi Word64
replacement in lib/Aftok/Util.hs at line 8

[3.5676]→[3.6778:6816](∅→∅)

import Data.Map.Strict as M

[3.5676]

[3.10199]

import Data.Map.Strict as M
replacement in lib/Aftok/Util.hs at line 22

[3.6897]→[3.6897:6917](∅→∅)

traverseKeys f m =

[3.6897]

[3.6917]

traverseKeys f m =
replacement in lib/Aftok.hs at line 9

[3.2690]→[3.1683:1742](∅→∅)

import Control.Lens (makeLenses, makePrisms)

[3.2690]

[3.5906]

import Control.Lens (makeLenses, makePrisms)
replacement in lib/Aftok.hs at line 15

[3.2593]→[3.7009:7078](∅→∅)

import Network.Haskoin.Crypto (Address(..), base58ToAddr)

[3.2593]

[3.7078]

import Network.Haskoin.Crypto (Address (..), base58ToAddr)
replacement in server/Aftok/Snaplet/Auctions.hs at line 48

[3.622]→[3.622:652](∅→∅)

snapEval . createAuction $

[3.622]

[3.652]

snapEval . createAuction $
replacement in server/Aftok/Snaplet/Payments.hs at line 11

[3.9959]→[3.9959:10001](∅→∅)

requestPaymentHandler :: Handler App App

[3.9959]

[3.10001]

requestPaymentHandler :: Handler App App
replacement in server/Aftok/Snaplet/Payments.hs at line 19

[3.10265]→[3.10265:10295](∅→∅)

-- look up the outstanding

[3.10265]

[3.10295]

-- look up the outstanding
replacement in server/Aftok/Snaplet/Projects.hs at line 36

[3.12167]→[3.2892:2914](∅→∅),[3.2892]→[3.2892:2914](∅→∅)

parseJSON _ = mzero

[3.12167]

[3.2914]

parseJSON _ = mzero