Skip to content

Commit

Permalink
SCP-1921: plutus-pab: PAB.Utils -> Data.Text.Extras
Browse files Browse the repository at this point in the history 
- Move `abbreviate` to `Data.Text.Extras` in `plutus-contract`
- Drop unused functions -> drop Utils module
- Update references
  • Loading branch information
@gilligan @j-mueller
gilligan authored and j-mueller committed Feb 24, 2021
1 parent a511e63 commit ce8fb3e
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 91 deletions.
2 changes: 1 addition & 1 deletion marlowe/app/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module Main where

import Data.Bifunctor (first)
import Data.Proxy (Proxy (..))
import Data.Text.Extras (tshow)
import Language.Marlowe.Client (MarloweSchema, marlowePlutusContract)
import Plutus.PAB.ContractCLI (commandLineApp')
import Plutus.PAB.Utils (tshow)

main :: IO ()
main =
Expand Down
11 changes: 10 additions & 1 deletion plutus-contract/src/Data/Text/Extras.hs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
{-# LANGUAGE OverloadedStrings #-}

module Data.Text.Extras(
tshow
abbreviate
, tshow
) where

import qualified Data.Text as T

tshow :: Show a => a -> T.Text
tshow = T.pack . show

abbreviate :: Int -> T.Text -> T.Text
abbreviate n txt
| n <= 0 = ""
| T.length txt > n = T.take (n - 1) txt <> "…"
| otherwise = txt
5 changes: 4 additions & 1 deletion plutus-pab/app/Cli.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ import Control.Monad.IO.Class (liftIO)
import Data.Foldable (traverse_)
import qualified Data.Map as Map
import qualified Data.Set as Set
import Data.Text.Prettyprint.Doc (defaultLayoutOptions, layoutPretty)
import Data.Text.Prettyprint.Doc.Render.Text (renderStrict)
import Plutus.PAB.MonadLoggerBridge (TraceLoggerT (..))
import Plutus.PAB.Monitoring (convertLog, defaultConfig, handleLogMsgTrace)

Expand All @@ -97,7 +99,6 @@ import Plutus.PAB.Types (Config (Config
metadataServerConfig, nodeServerConfig,
requestProcessingConfig, signingProcessConfig,
walletServerConfig)
import Plutus.PAB.Utils (render)
import qualified Plutus.PAB.Webserver.Server as PABServer

-- | Interpret a 'Command' in 'Eff' using the provided tracer and configurations
Expand Down Expand Up @@ -198,6 +199,8 @@ runCliCommand _ _ _ _ (ContractState uuid) =
runCliCommand _ _ _ _ ReportInstalledContracts = do
logInfo InstalledContractsMsg
traverse_ (logInfo . InstalledContract . render . pretty) =<< Core.installedContracts @ContractExe
where
render = renderStrict . layoutPretty defaultLayoutOptions

-- Get all active contracts
runCliCommand _ _ _ _ ReportActiveContracts = do
Expand Down
6 changes: 3 additions & 3 deletions plutus-pab/app/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import Cardano.BM.Setup (setupTrace_)
import Control.Concurrent.Availability (newToken)
import Control.Monad (when)
import Control.Monad.IO.Class (liftIO)
import Control.Monad.Logger (runStdoutLoggingT)
import Control.Monad.Logger (logErrorN, runStdoutLoggingT)
import Data.Foldable (for_)
import Data.Text.Extras (tshow)
import Data.Yaml (decodeFileThrow)
import Plutus.PAB.App (monadLoggerTracer, runApp)
import Plutus.PAB.Monitoring (convertLog, defaultConfig, handleLogMsgTrace, loadConfig)
import Plutus.PAB.PABLogMsg (AppMsg (..))
import Plutus.PAB.Utils (logErrorS)
import System.Exit (ExitCode (ExitFailure), exitSuccess, exitWith)


Expand All @@ -56,7 +56,7 @@ main = do
where

handleError err = do
runStdoutLoggingT $ logErrorS err
runStdoutLoggingT $ (logErrorN . tshow) err
exitWith (ExitFailure 1)

executePABCommand t logConfig config availability cmd = runApp (convertLog PABMsg t) logConfig config
Expand Down
4 changes: 2 additions & 2 deletions plutus-pab/atomic-swap-contract/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module Main
) where

import Data.Bifunctor (first)
import qualified Data.Text as T
import Plutus.PAB.ContractCLI (commandLineApp)
import Plutus.PAB.Effects.ContractTest.AtomicSwap (atomicSwap)
import Plutus.PAB.Utils (tshow)

main :: IO ()
main = commandLineApp $ first tshow atomicSwap
main = commandLineApp $ first (T.pack . show) atomicSwap
4 changes: 2 additions & 2 deletions plutus-pab/currency-contract/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ module Main

import Control.Monad (void)
import Data.Bifunctor (first)
import qualified Data.Text as T
import Language.PlutusTx.Coordination.Contracts.Currency (forgeCurrency)
import Plutus.PAB.ContractCLI (commandLineApp)
import Plutus.PAB.Utils (tshow)

main :: IO ()
main = commandLineApp $ first tshow $ void forgeCurrency
main = commandLineApp $ first (T.pack . show) $ void forgeCurrency
4 changes: 2 additions & 2 deletions plutus-pab/pay-to-wallet-contract/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module Main
) where

import Data.Bifunctor (first)
import qualified Data.Text as T
import Plutus.PAB.ContractCLI (commandLineApp)
import Plutus.PAB.Effects.ContractTest.PayToWallet (payToWallet)
import Plutus.PAB.Utils (tshow)

main :: IO ()
main = commandLineApp $ first tshow payToWallet
main = commandLineApp $ first (T.pack . show) payToWallet
8 changes: 5 additions & 3 deletions plutus-pab/plutus-pab.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ library
Plutus.PAB.Relation
Plutus.PAB.PABLogMsg
Plutus.PAB.Types
Plutus.PAB.Utils
other-modules:
Servant.Extra
hs-source-dirs: src
Expand Down Expand Up @@ -269,7 +268,8 @@ executable plutus-currency
build-depends:
base >=4.9 && <5,
plutus-pab,
plutus-use-cases -any
plutus-use-cases -any,
text -any

executable plutus-atomic-swap
main-is: Main.hs
Expand All @@ -280,6 +280,7 @@ executable plutus-atomic-swap
-Wno-missing-import-lists -Wredundant-constraints -O0
build-depends:
base >=4.9 && <5,
text -any,
plutus-pab

executable plutus-pay-to-wallet
Expand All @@ -291,7 +292,8 @@ executable plutus-pay-to-wallet
-Wno-missing-import-lists -Wredundant-constraints -O0
build-depends:
base >=4.9 && <5,
plutus-pab
plutus-pab,
text -any

test-suite plutus-pab-test
default-language: Haskell2010
Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/prism/credential-manager/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ module Main where

import Data.Bifunctor (first)
import Data.Proxy (Proxy (..))
import Data.Text.Extras (tshow)
import Language.Plutus.Contract (BlockchainActions, type (.\/))
import Language.Plutus.Contract.Effects.RPC (RPCServer)
import Language.PlutusTx.Coordination.Contracts.Prism.CredentialManager (CredentialManager,
CredentialManagerSchema,
credentialManager)
import Plutus.PAB.ContractCLI (commandLineApp')
import Plutus.PAB.Utils (tshow)

main :: IO ()
main =
Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/prism/mirror/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
module Main where

import Data.Bifunctor (first)
import Data.Text.Extras (tshow)
import Language.PlutusTx.Coordination.Contracts.Prism.Mirror (MirrorSchema, mirror)
import Plutus.PAB.ContractCLI (commandLineApp)
import Plutus.PAB.Utils (tshow)

main :: IO ()
main =
Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/prism/unlock-exchange/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ module Main where

import Data.Bifunctor (first)
import Data.Proxy (Proxy (..))
import Data.Text.Extras (tshow)
import Language.Plutus.Contract (BlockchainActions, type (.\/))
import Language.Plutus.Contract.Effects.RPC (RPCClient)
import Language.PlutusTx.Coordination.Contracts.Prism.CredentialManager (CredentialManager)
import Language.PlutusTx.Coordination.Contracts.Prism.Unlock as Prism
import Plutus.PAB.ContractCLI (commandLineApp')
import Plutus.PAB.Utils (tshow)

main :: IO ()
main =
Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/prism/unlock-sto/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ module Main where

import Data.Bifunctor (first)
import Data.Proxy (Proxy (..))
import Data.Text.Extras (tshow)
import Language.Plutus.Contract (BlockchainActions, type (.\/))
import Language.Plutus.Contract.Effects.RPC (RPCClient)
import Language.PlutusTx.Coordination.Contracts.Prism.CredentialManager (CredentialManager)
import Language.PlutusTx.Coordination.Contracts.Prism.Unlock as Prism
import Plutus.PAB.ContractCLI (commandLineApp')
import Plutus.PAB.Utils (tshow)

main :: IO ()
main =
Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/src/Cardano/Metadata/Mock.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import Data.Maybe (fromMaybe)
import Data.Set (Set)
import qualified Data.Set as Set
import Data.Text.Encoding (encodeUtf8)
import Data.Text.Extras (tshow)
import Ledger.Bytes (LedgerBytes)
import Ledger.Crypto (PrivateKey, PubKey, getPubKey, pubKeyHash, sign)
import Plutus.PAB.Utils (tshow)
import Wallet.Emulator.Wallet (Wallet (Wallet), walletPrivKey, walletPubKey)


Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/src/Plutus/PAB/Core/ContractInstance.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import Wallet.Effects (ChainIndexEffe
SigningProcessEffect, WalletEffect)
import Wallet.Emulator.LogMessages (TxBalanceMsg)

import Data.Text.Extras (tshow)
import Plutus.PAB.Command (saveBalancedTx, saveBalancedTxResult,
sendContractEvent)
import Plutus.PAB.Effects.Contract (ContractCommand (..), ContractEffect)
Expand All @@ -85,7 +86,6 @@ import qualified Plutus.PAB.Events.Contract as Events.Contr
import qualified Plutus.PAB.Query as Query
import Plutus.PAB.Types (PABError (..),
Source (ContractEventSource, NodeEventSource, WalletEventSource))
import Plutus.PAB.Utils (tshow)

import qualified Plutus.PAB.Core.Projections as Projections

Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/src/Plutus/PAB/Effects/ContractTest.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import Data.Text.Prettyprint.Doc
import Data.Void (Void, absurd)
import GHC.Generics (Generic)

import Data.Text.Extras (tshow)
import Plutus.PAB.Effects.Contract (ContractCommand (..), ContractEffect (..))
import Plutus.PAB.Events.Contract (ContractHandlersResponse (..), ContractPABRequest,
PartiallyDecodedResponse)
import qualified Plutus.PAB.Events.Contract as C
import Plutus.PAB.Types (PABError (..))
import Plutus.PAB.Utils (tshow)

import Control.Monad.Freer.Extras.Log (LogMsg, logDebug)

Expand Down
2 changes: 1 addition & 1 deletion plutus-pab/src/Plutus/PAB/Events/Contract.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import Language.Plutus.Contract.Effects.Instance (OwnIdRequest
import Language.Plutus.Contract.Effects.OwnPubKey (OwnPubKeyRequest)
import Language.Plutus.Contract.Effects.UtxoAt (UtxoAtAddress)

import Plutus.PAB.Utils (abbreviate)
import Data.Text.Extras (abbreviate)
import Wallet.Effects (AddressChangeRequest, AddressChangeResponse)
import Wallet.Types (ContractInstanceId (..), Notification,
NotificationError)
Expand Down
67 changes: 0 additions & 67 deletions plutus-pab/src/Plutus/PAB/Utils.hs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion plutus-pab/test/Plutus/PAB/CoreSpec.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import qualified Data.Map as Map
import qualified Data.Set as Set
import Data.Text (Text)
import qualified Data.Text as Text
import Data.Text.Extras (tshow)
import Language.PlutusTx.Coordination.Contracts.Currency (SimpleMPS (..))
import qualified Language.PlutusTx.Coordination.Contracts.Game as Contracts.Game
import Ledger (pubKeyAddress)
Expand All @@ -43,7 +44,6 @@ import Plutus.PAB.MockApp (TestState, T
import qualified Plutus.PAB.Query as Query
import Plutus.PAB.Types (PABError (..), chainOverviewBlockchain,
mkChainOverview)
import Plutus.PAB.Utils (tshow)
import Test.QuickCheck.Instances.UUID ()
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.HUnit (testCase)
Expand Down

0 comments on commit ce8fb3e

Please sign in to comment.