Merge pull request #148 from mlabs-haskell/uhbif19/121-refactor-imports

Refactor imports to conform to MLabs policy

app/CLI/Actions.hs

@@ -24,23 +24,23 @@ import HydraAuction.Runner (
   initWallet,
   withActor,
  )
-import HydraAuction.Tx.Common
+import HydraAuction.Tx.Common (actorTipUtxo, scriptUtxos)
 import HydraAuction.Tx.Escrow (
   announceAuction,
   bidderBuys,
   sellerReclaims,
   startBidding,
  )
-import HydraAuction.Tx.StandingBid
-import HydraAuction.Tx.TestNFT
+import HydraAuction.Tx.StandingBid (cleanupTx, newBid)
+import HydraAuction.Tx.TermsConfig (constructTermsDynamic)
+import HydraAuction.Tx.TestNFT (mintOneTestNFT)
 import HydraAuction.Types (Natural)
 
 -- Hydra auction CLI imports
 import CLI.Config (
   AuctionName,
   CliEnhancedAuctionTerms (..),
   configToAuctionTerms,
-  constructTermsDynamic,
   readAuctionTerms,
   readAuctionTermsConfig,
   readCliEnhancedAuctionTerms,

app/CLI/CardanoNode.hs

@@ -6,7 +6,7 @@ import Prelude
 
 -- Haskell imports
 
-import Control.Concurrent.MVar
+import Control.Concurrent.MVar (newEmptyMVar, takeMVar)
 import System.FilePath ((</>))
 
 -- Cardano node imports

app/CLI/Config.hs

@@ -1,12 +1,9 @@
 module CLI.Config (
   AuctionName (..),
   DirectoryKind (..),
-  AuctionTermsConfig (..),
-  AuctionTermsDynamic (..),
   CliEnhancedAuctionTerms (..),
   readCliEnhancedAuctionTerms,
   getAuctionDirectory,
-  constructTermsDynamic,
   readAuctionTermsConfig,
   readAuctionTermsDynamic,
   readAuctionTerms,
@@ -25,13 +22,17 @@ import Data.Aeson (FromJSON, ToJSON)
 import Data.Aeson qualified as Aeson
 import Data.ByteString qualified as BS
 import Data.ByteString.Lazy qualified as LBS
-import System.Directory
+import System.Directory (createDirectoryIfMissing, getCurrentDirectory)
 import System.FilePath ((<.>), (</>))
 
 -- Hydra auction imports
 import HydraAuction.Fixture (Actor (..))
-import HydraAuction.Tx.TermsConfig
-import HydraAuction.Types
+import HydraAuction.Tx.TermsConfig (
+  AuctionTermsConfig,
+  AuctionTermsDynamic (..),
+  configToAuctionTerms,
+ )
+import HydraAuction.Types (AuctionTerms)
 
 -- =============================================================================
 -- Auction config and state directories

app/CLI/Parsers/TxIn.hs

@@ -8,7 +8,7 @@ import Prelude
 -- Haskell imports
 import Data.Bifunctor (first)
 import Data.ByteString.Char8 qualified as BSC
-import Options.Applicative
+import Options.Applicative (ReadM, eitherReader, some)
 import Text.Parsec ((<?>))
 import Text.Parsec qualified as Parsec
 import Text.Parsec.Error qualified as Parsec

app/Main.hs

@@ -8,7 +8,12 @@ import Control.Concurrent.Async (withAsync)
 import Control.Monad (void, when)
 import Control.Monad.Catch (try)
 import Control.Monad.Trans.Class (lift)
-import System.Console.Haskeline
+import System.Console.Haskeline (
+  InputT,
+  defaultSettings,
+  getInputLine,
+  runInputT,
+ )
 
 -- Hydra imports
 import Hydra.Logging (Verbosity (Quiet, Verbose))

src/HydraAuction/Fixture.hs

@@ -4,7 +4,7 @@ module HydraAuction.Fixture (
 ) where
 
 -- Prelude imports
-import Hydra.Prelude
+import Prelude
 
 -- Hydra imports
 import Hydra.Cardano.Api (
@@ -20,7 +20,9 @@ import Hydra.Cardano.Api (
 -- Haskell imports
 
 import Data.Aeson qualified as Aeson
+import Data.Bifunctor (first)
 import Data.ByteString qualified as BS
+import GHC.Generics (Generic)
 import Paths_hydra_auction qualified as Pkg
 import System.FilePath ((<.>), (</>))
 
@@ -56,7 +58,7 @@ keysFor actor = do
     asSigningKey = AsSigningKey AsPaymentKey
 
 -- | Lookup a config file similar reading a file from disk.
-readConfigFile :: FilePath -> IO ByteString
+readConfigFile :: FilePath -> IO BS.ByteString
 readConfigFile source = do
   filename <- Pkg.getDataFileName ("data" </> source)
   BS.readFile filename

src/HydraAuction/OnChain.hs

@@ -11,12 +11,25 @@ import Plutus.V2.Ledger.Api (CurrencySymbol, MintingPolicy, ScriptContext, Valid
 import PlutusTx qualified
 
 -- Hydra auction imports
-import HydraAuction.Addresses
-import HydraAuction.OnChain.Escrow
-import HydraAuction.OnChain.StandingBid
-import HydraAuction.OnChain.StateToken
-import HydraAuction.Plutus.Extras
-import HydraAuction.Types
+import HydraAuction.Addresses (
+  EscrowAddress (..),
+  FeeEscrowAddress (..),
+  StandingBidAddress (..),
+ )
+import HydraAuction.OnChain.Escrow (mkEscrowValidator)
+import HydraAuction.OnChain.StandingBid (mkStandingBidValidator)
+import HydraAuction.OnChain.StateToken (
+  StateTokenKind (..),
+  mkPolicy,
+  stateTokenKindToTokenName,
+ )
+import HydraAuction.Plutus.Extras (
+  scriptCurrencySymbol,
+  validatorAddress,
+  wrapMintingPolicy,
+  wrapValidator,
+ )
+import HydraAuction.Types (AuctionTerms (..))
 
 -- Addresses
 

src/HydraAuction/OnChain/Common.hs

@@ -12,7 +12,7 @@ import Plutus.V2.Ledger.Contexts (TxInfo, TxOut, findDatum, txInfoMint, txOutAdd
 import PlutusTx qualified
 
 -- Hydra auction imports
-import HydraAuction.Types
+import HydraAuction.Types (AuctionTerms (..), naturalToInt)
 
 {-# INLINEABLE minAuctionFee #-}
 minAuctionFee :: Integer

src/HydraAuction/OnChain/Escrow.hs

@@ -11,10 +11,33 @@ import Plutus.V2.Ledger.Api (Address, TxInfo, TxOut, scriptContextTxInfo, txInIn
 import Plutus.V2.Ledger.Contexts (ScriptContext, ownHash, txSignedBy)
 
 -- Hydra auction imports
-import HydraAuction.Addresses
-import HydraAuction.OnChain.Common
-import HydraAuction.OnChain.StateToken (StateTokenKind (..), stateTokenKindToTokenName)
-import HydraAuction.Types
+import HydraAuction.Addresses (
+  FeeEscrowAddress (..),
+  StandingBidAddress (..),
+  VoucherCS (..),
+ )
+import HydraAuction.OnChain.Common (
+  byAddress,
+  decodeOutputDatum,
+  lovelaceOfOutput,
+  nothingForged,
+ )
+import HydraAuction.OnChain.StateToken (
+  StateTokenKind (..),
+  stateTokenKindToTokenName,
+ )
+import HydraAuction.Types (
+  AuctionEscrowDatum (..),
+  AuctionState (..),
+  AuctionTerms (..),
+  BidTerms (..),
+  EscrowRedeemer (..),
+  StandingBidDatum (..),
+  StandingBidState (..),
+  calculateTotalFee,
+  isStarted,
+  naturalToInt,
+ )
 
 {-# INLINEABLE mkEscrowValidator #-}
 mkEscrowValidator :: (StandingBidAddress, FeeEscrowAddress, AuctionTerms) -> AuctionEscrowDatum -> EscrowRedeemer -> ScriptContext -> Bool

src/HydraAuction/OnChain/StandingBid.hs

@@ -11,10 +11,20 @@ import Plutus.V2.Ledger.Api (TxInfo, scriptContextTxInfo, txInInfoResolved, txIn
 import Plutus.V2.Ledger.Contexts (ScriptContext, ownHash)
 
 -- Hydra auction imports
-import HydraAuction.Addresses
-import HydraAuction.OnChain.Common
+import HydraAuction.Addresses (VoucherCS (..))
+import HydraAuction.OnChain.Common (
+  byAddress,
+  decodeOutputDatum,
+  nothingForged,
+ )
 import HydraAuction.OnChain.StateToken (StateTokenKind (..), stateTokenKindToTokenName)
-import HydraAuction.Types
+import HydraAuction.Types (
+  AuctionTerms (..),
+  BidTerms (..),
+  StandingBidDatum (..),
+  StandingBidRedeemer (..),
+  StandingBidState (..),
+ )
 
 {-# INLINEABLE mkStandingBidValidator #-}
 mkStandingBidValidator :: AuctionTerms -> StandingBidDatum -> StandingBidRedeemer -> ScriptContext -> Bool

src/HydraAuction/OnChain/StateToken.hs

@@ -12,9 +12,14 @@ import Plutus.V2.Ledger.Api (TokenName (..))
 import Plutus.V2.Ledger.Contexts (ScriptContext, TxInfo, ownCurrencySymbol, scriptContextTxInfo, txInInfoOutRef, txInfoInputs, txInfoMint, txInfoOutputs, txInfoValidRange, txOutAddress)
 
 -- Hydra auction imports
-import HydraAuction.Addresses
-import HydraAuction.OnChain.Common
-import HydraAuction.Types
+import HydraAuction.Addresses (EscrowAddress (..), VoucherCS (..))
+import HydraAuction.OnChain.Common (decodeOutputDatum, validAuctionTerms)
+import HydraAuction.Types (
+  AuctionEscrowDatum (..),
+  AuctionState (..),
+  AuctionTerms (..),
+  VoucherForgingRedeemer (..),
+ )
 
 data StateTokenKind = Voucher
 

src/HydraAuction/OnChain/TestNFT.hs

@@ -6,10 +6,10 @@ import PlutusTx.Prelude
 -- Plutus imports
 import Plutus.V1.Ledger.Value (AssetClass (..))
 import Plutus.V2.Ledger.Api (CurrencySymbol, MintingPolicy, TokenName (..), mkMintingPolicyScript)
-import PlutusTx
+import PlutusTx qualified
 
 -- Hydra auction imports
-import HydraAuction.Plutus.Extras
+import HydraAuction.Plutus.Extras (scriptCurrencySymbol)
 
 testNftPolicy :: MintingPolicy
 testNftPolicy =

src/HydraAuction/Plutus/Extras.hs

@@ -2,8 +2,9 @@
 module HydraAuction.Plutus.Extras (module X, validatorAddress, scriptCurrencySymbol) where
 
 -- Prelude imports
-import Hydra.Prelude hiding (fromMaybe)
+
 import PlutusTx.Prelude (toBuiltin)
+import Prelude
 
 -- Plutus imports
 import Plutus.V1.Ledger.Address (Address, scriptHashAddress)

src/HydraAuction/Runner/Time.hs

@@ -4,7 +4,9 @@ module HydraAuction.Runner.Time (
 ) where
 
 -- Prelude imports
-import Hydra.Prelude hiding (threadDelay)
+
+import Hydra.Prelude (ask, liftIO, when)
+import Prelude
 
 -- Haskell imports
 import Control.Concurrent (threadDelay)

src/HydraAuction/Runner/Tracer.hs

@@ -7,11 +7,22 @@ module HydraAuction.Runner.Tracer (
 ) where
 
 -- Prelude imports
-import Hydra.Prelude
+
+import Hydra.Prelude (
+  IOMode (ReadWriteMode),
+  TVar,
+  atomically,
+  onException,
+  withFile,
+ )
+import Prelude
 
 -- Haskell imports
+
 import Control.Concurrent.STM.TVar (modifyTVar, newTVarIO, readTVarIO)
 import Control.Tracer (Tracer (..))
+import Data.Aeson (FromJSON, ToJSON)
+import GHC.Generics (Generic)
 import System.FilePath ((</>))
 
 -- Hydra imports