Skip to content

Commit 8ebf937

Browse files
committed
Styling
1 parent 0243fac commit 8ebf937

File tree

4 files changed

+92
-44
lines changed

4 files changed

+92
-44
lines changed

metadata-sync/src/Cardano/Metadata/Sync.hs

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,31 @@
33
module Cardano.Metadata.Sync where
44

55
import qualified Data.Aeson as Aeson
6-
import Data.Text (Text)
6+
import Data.Functor
7+
( void )
8+
import Data.String
9+
( fromString )
10+
import Data.Text
11+
( Text )
712
import qualified Data.Text as T
13+
import Data.Traversable
14+
( forM )
15+
import Database.PostgreSQL.Simple
16+
( Connection, execute, executeMany, withTransaction )
17+
import Database.PostgreSQL.Simple.Types
18+
( Identifier (..), In (..), Only (..) )
19+
import System.Directory
20+
( listDirectory )
21+
import System.FilePath.Posix
22+
( takeBaseName )
23+
import System.IO.Temp
24+
( withSystemTempDirectory )
825
import qualified Turtle.Prelude as Turtle
9-
import System.Directory (listDirectory)
10-
import System.FilePath.Posix (takeBaseName)
11-
import Data.String (fromString)
12-
import System.IO.Temp (withSystemTempDirectory)
13-
import Database.PostgreSQL.Simple (withTransaction, execute, executeMany, Connection)
14-
import Database.PostgreSQL.Simple.Types (Identifier(..), Only(..), In(..))
15-
import Data.Traversable (forM)
16-
import Data.Functor (void)
17-
18-
import Cardano.Metadata.Sync.Config (withConnectionFromPool)
19-
import Cardano.Metadata.Types.Common (Subject(..))
26+
27+
import Cardano.Metadata.Sync.Config
28+
( withConnectionFromPool )
29+
import Cardano.Metadata.Types.Common
30+
( Subject (..) )
2031

2132
-- | View the current state of the registry (source-of-truth).
2233
view :: Text -> Text -> IO [(Subject, Aeson.Value)]

metadata-sync/src/Cardano/Metadata/Sync/Config.hs

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,38 @@
22

33
module Cardano.Metadata.Sync.Config where
44

5-
import Data.Text (Text)
5+
import Control.Exception
6+
( bracket )
7+
import qualified Data.ByteString.Char8 as BC
8+
import Data.Pool
9+
( Pool, createPool, destroyAllResources )
10+
import qualified Data.Pool as Pool
11+
import Data.Text
12+
( Text )
613
import qualified Data.Text as T
714
import qualified Data.Text.Encoding as TE
8-
import Options.Applicative (Parser, ParserInfo)
9-
import qualified Options.Applicative as Opt
10-
import Options.Applicative (strOption, long, metavar, help, showDefault, value, option, auto, info, fullDesc, progDesc, header)
11-
import Data.Pool (Pool, createPool, destroyAllResources)
12-
import Database.PostgreSQL.Simple (Connection)
13-
import Data.Time.Clock (NominalDiffTime)
15+
import Data.Time.Clock
16+
( NominalDiffTime )
17+
import Database.PostgreSQL.Simple
18+
( Connection )
1419
import qualified Database.PostgreSQL.Simple as Sql
15-
import qualified Data.Pool as Pool
16-
import qualified Data.ByteString.Char8 as BC
17-
import Control.Exception (bracket)
20+
import Options.Applicative
21+
( Parser, ParserInfo )
22+
import Options.Applicative
23+
( auto
24+
, fullDesc
25+
, header
26+
, help
27+
, info
28+
, long
29+
, metavar
30+
, option
31+
, progDesc
32+
, showDefault
33+
, strOption
34+
, value
35+
)
36+
import qualified Options.Applicative as Opt
1837

1938
data Opts = Opts
2039
{ optDbName :: Text

metadata-sync/src/Main.hs

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
module Main where
22

3+
import Control.Exception
4+
( bracket )
35
import Control.Monad.IO.Class
46
( liftIO )
57
import qualified Data.ByteString.Char8 as BC
8+
import Data.Pool
9+
( Pool, createPool, destroyAllResources )
610
import qualified Data.Text as T
11+
import Data.Time.Clock
12+
( NominalDiffTime )
13+
import Database.PostgreSQL.Simple
14+
( Connection, close, connectPostgreSQL )
715
import qualified Network.Wai.Handler.Warp as Warp
816
import qualified Options.Applicative as Opt
9-
import Control.Exception (bracket)
10-
import Database.PostgreSQL.Simple (Connection, connectPostgreSQL, close)
11-
import Data.Pool (Pool, createPool, destroyAllResources)
12-
import Data.Time.Clock (NominalDiffTime)
1317

1418
import qualified Cardano.Metadata.Sync as Sync
1519
import Cardano.Metadata.Sync.Config
16-
( Opts (..), pgConnectionString, parseOpts, withConnectionPool, withConnectionFromPool, opts)
20+
( Opts (..)
21+
, opts
22+
, parseOpts
23+
, pgConnectionString
24+
, withConnectionFromPool
25+
, withConnectionPool
26+
)
1727

1828
main :: IO ()
1929
main = do

metadata-sync/test/Main.hs

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
{-# LANGUAGE TupleSections #-}
44
{-# LANGUAGE TypeApplications #-}
55

6+
import Control.Exception
7+
( SomeException, catch )
8+
import Control.Monad
9+
( join, void )
610
import Control.Monad.IO.Class
711
( liftIO )
812
import Control.Monad.Logger
913
( runNoLoggingT )
14+
import qualified Data.Aeson as Aeson
15+
import qualified Data.HashMap.Strict as HM
16+
import Data.Pool
17+
( Pool, destroyAllResources )
1018
import Data.Proxy
1119
( Proxy (Proxy) )
1220
import Data.Tagged
@@ -15,11 +23,14 @@ import Data.Text
1523
( Text )
1624
import qualified Data.Text as T
1725
import qualified Data.Text.Encoding as TE
18-
import qualified Data.Aeson as Aeson
1926
import Data.Word
2027
( Word8 )
21-
import Data.Pool (Pool, destroyAllResources)
22-
import Control.Monad (join, void)
28+
import Hedgehog
29+
( MonadGen, evalIO, forAll, property, (===) )
30+
import qualified Hedgehog as H
31+
( Property )
32+
import qualified Hedgehog.Gen as Gen
33+
import qualified Hedgehog.Range as Range
2334
import Test.Tasty
2435
( TestTree
2536
, askOption
@@ -29,28 +40,25 @@ import Test.Tasty
2940
, testGroup
3041
, withResource
3142
)
32-
import Test.Tasty.Options
33-
import Hedgehog
34-
( evalIO, forAll, property, (===), MonadGen )
35-
import qualified Hedgehog as H
36-
( Property )
37-
import Control.Exception (catch, SomeException)
38-
import qualified Hedgehog.Gen as Gen
39-
import qualified Data.HashMap.Strict as HM
40-
import qualified Hedgehog.Range as Range
4143
import Test.Tasty
4244
import Test.Tasty.Hedgehog
45+
import Test.Tasty.Options
4346

4447
import Cardano.Metadata.Store.Types
45-
import Cardano.Metadata.Types.Common (Subject(..), unPropertyName)
46-
import Cardano.Metadata.Sync.Config (mkConnectionPool, withConnectionFromPool)
47-
import Cardano.Metadata.Sync (write)
48+
import Cardano.Metadata.Sync
49+
( write )
50+
import Cardano.Metadata.Sync.Config
51+
( mkConnectionPool, withConnectionFromPool )
52+
import Cardano.Metadata.Types.Common
53+
( Subject (..), unPropertyName )
54+
import Database.PostgreSQL.Simple
55+
( Connection, execute, executeMany, query, withTransaction )
56+
import Database.PostgreSQL.Simple.Types
57+
( Identifier (..), Only (..) )
4858
import Test.Cardano.Metadata.Generators
4959
( ComplexType )
5060
import qualified Test.Cardano.Metadata.Generators as Gen
5161
import Test.Cardano.Metadata.Store
52-
import Database.PostgreSQL.Simple (query, withTransaction, execute, executeMany, Connection)
53-
import Database.PostgreSQL.Simple.Types (Only(..), Identifier(..))
5462

5563
newtype DbHost = DbHost { _dbHost :: Text }
5664
newtype DbName = DbName { _dbName :: Text }

0 commit comments

Comments
 (0)