From 86e1300c87681a1c838f2bb8670b025cc8700785 Mon Sep 17 00:00:00 2001 From: gege251 Date: Tue, 25 Jan 2022 09:27:19 +0100 Subject: [PATCH 1/2] Rename project to bot-plutus-interface --- Makefile | 10 ++--- README.md | 22 +++++------ mlabs-pab.cabal => bot-plutus-interface.cabal | 38 +++++++++---------- examples/plutus-game/app/Main.hs | 6 +-- examples/plutus-game/plutus-game.cabal | 10 ++--- examples/plutus-nft/app/Main.hs | 6 +-- examples/plutus-nft/plutus-nft.cabal | 10 ++--- flake.nix | 2 +- hie.yaml | 4 +- src/{MLabsPAB.hs => BotPlutusInterface.hs} | 8 ++-- .../CardanoCLI.hs | 10 ++--- .../ChainIndex.hs | 4 +- .../Contract.hs | 12 +++--- .../Effects.hs | 6 +-- src/{MLabsPAB => BotPlutusInterface}/Files.hs | 6 +-- .../PreBalance.hs | 10 ++--- .../Server.hs | 6 +-- src/{MLabsPAB => BotPlutusInterface}/Types.hs | 2 +- .../UtxoParser.hs | 2 +- test/Spec.hs | 14 +++---- .../Contract.hs | 6 +-- .../PreBalance.hs | 6 +-- .../UtxoParser.hs | 6 +-- test/Spec/MockContract.hs | 10 ++--- 24 files changed, 108 insertions(+), 108 deletions(-) rename mlabs-pab.cabal => bot-plutus-interface.cabal (82%) rename src/{MLabsPAB.hs => BotPlutusInterface.hs} (67%) rename src/{MLabsPAB => BotPlutusInterface}/CardanoCLI.hs (98%) rename src/{MLabsPAB => BotPlutusInterface}/ChainIndex.hs (96%) rename src/{MLabsPAB => BotPlutusInterface}/Contract.hs (95%) rename src/{MLabsPAB => BotPlutusInterface}/Effects.hs (98%) rename src/{MLabsPAB => BotPlutusInterface}/Files.hs (98%) rename src/{MLabsPAB => BotPlutusInterface}/PreBalance.hs (97%) rename src/{MLabsPAB => BotPlutusInterface}/Server.hs (98%) rename src/{MLabsPAB => BotPlutusInterface}/Types.hs (98%) rename src/{MLabsPAB => BotPlutusInterface}/UtxoParser.hs (98%) rename test/Spec/{MLabsPAB => BotPlutusInterface}/Contract.hs (99%) rename test/Spec/{MLabsPAB => BotPlutusInterface}/PreBalance.hs (96%) rename test/Spec/{MLabsPAB => BotPlutusInterface}/UtxoParser.hs (97%) diff --git a/Makefile b/Makefile index 21ab921e..d26aab2b 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ usage: @echo "Available commands:" @echo " hoogle -- Start local hoogle" @echo " build -- Run cabal v2-build" - @echo " watch -- Track files: mlabs-pab.cabal, src/* and run 'make build' on change" + @echo " watch -- Track files: bot-plutus-interface.cabal, src/* and run 'make build' on change" @echo " test -- Run cabal v2-test" @echo " accept_pirs -- Accept new PIR changes" - @echo " ghci -- Run cabal v2-repl mlabs-pab" + @echo " ghci -- Run cabal v2-repl bot-plutus-interface" @echo " format -- Apply source code formatting with fourmolu" @echo " format_check -- Check source code formatting without making changes" @echo " nixfmt -- Apply nix formatting with nixfmt" @@ -48,7 +48,7 @@ build: requires_nix_shell cabal v2-build $(GHC_FLAGS) watch: requires_nix_shell - while sleep 1; do find src mlabs-pab.cabal | entr -cd make build; done + while sleep 1; do find src bot-plutus-interface.cabal | entr -cd make build; done test: requires_nix_shell cabal v2-test @@ -57,7 +57,7 @@ accept_pirs: requires_nix_shell stack build --test $(STACK_FLAGS) $(GHC_FLAGS) --ta '-p MarketAction --accept' ghci: requires_nix_shell - cabal v2-repl $(GHC_FLAGS) mlabs-pab + cabal v2-repl $(GHC_FLAGS) bot-plutus-interface # Source dirs to run fourmolu on FORMAT_SOURCES := $(shell git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs' ) @@ -113,7 +113,7 @@ update_plutus: ################################################################################ # Geth -build_path = dist-newstyle/build/x86_64-linux/ghc-8.10.4.20210212/mlabs-pab-0.1 +build_path = dist-newstyle/build/x86_64-linux/ghc-8.10.4.20210212/bot-plutus-interface-0.1 clear_build: @[ ! -e $(build_path) ] || rm -rf $(build_path) diff --git a/README.md b/README.md index 980c1495..0ee317a7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MLabPAB (Plutus Fake PAB) +# Bot Plutus Interface (formerly MLabsPAB or Plutus Fake PAB) This is a custom implementation of the PAB as the official one is not ready yet. This PAB is not feature complete, and not fully tested with all use cases, so please use it with care! @@ -78,7 +78,7 @@ main = do , -- Protocol params file location relative to the cardano-cli working directory (needed for the cli) pcProtocolParamsFile = "./protocol.json" } - MLabsPAB.runPAB @MyContracts pabConf + BotPlutusInterface.runPAB @MyContracts pabConf ``` To run the fake PAB, you need to prepare a few more things: @@ -102,16 +102,16 @@ cardano-cli address key-hash --verification-key-file VERIFICATION_KEY.vkey The fake PAB consists of the following modules: -- **MLabsPAB** main entry point -- **MLabsPAB.Server** Servant server, handling http endpoint calls and websockets -- **MLabsPAB.Contract** handling contract effects by creating the necessary files and calling cardano-cli commands (a few effects are mocked) -- **MLabsPAB.PreBalance** doing some preparations so the cli can process the rest (non-ada asset balancing, addig tx inputs, adding minimum lovelaces, add signatories) -- **MLabsPAB.CardanoCLI** wrappers for cardano-cli commands +- **BotPlutusInterface** main entry point +- **BotPlutusInterface.Server** Servant server, handling http endpoint calls and websockets +- **BotPlutusInterface.Contract** handling contract effects by creating the necessary files and calling cardano-cli commands (a few effects are mocked) +- **BotPlutusInterface.PreBalance** doing some preparations so the cli can process the rest (non-ada asset balancing, addig tx inputs, adding minimum lovelaces, add signatories) +- **BotPlutusInterface.CardanoCLI** wrappers for cardano-cli commands - For development purposes, I created an ssh wrapper, so I can call relay these commands through an ssh connection. This is not nice, unsafe, and pretty slow, so I'm hoping to get rid of this pretty soon. -- **MLabsPAB.UtxoParser** parse the output of the `cardano-cli query utxo` command -- **MLabsPAB.Files** functions for handling script, datum and redeemer files -- **MLabsPAB.Types** configuration for the fake pab -- **MLabsPAB.PreBalance** prepare a transaction before sending to the cli for balancing. This includes: +- **BotPlutusInterface.UtxoParser** parse the output of the `cardano-cli query utxo` command +- **BotPlutusInterface.Files** functions for handling script, datum and redeemer files +- **BotPlutusInterface.Types** configuration for the fake pab +- **BotPlutusInterface.PreBalance** prepare a transaction before sending to the cli for balancing. This includes: - adding tx inputs to cover fees and outputs - adding collaterals, - modifying tx outs to contain the minimum amount of lovelaces diff --git a/mlabs-pab.cabal b/bot-plutus-interface.cabal similarity index 82% rename from mlabs-pab.cabal rename to bot-plutus-interface.cabal index 3aa44a4c..952e409d 100644 --- a/mlabs-pab.cabal +++ b/bot-plutus-interface.cabal @@ -1,12 +1,12 @@ cabal-version: 3.0 -name: mlabs-pab +name: bot-plutus-interface version: 0.1.0.0 synopsis: Unofficial PAB implementation description: Unofficial PAB imlementation, using the cardano-cli in the background to submit transactions -homepage: https://github.com/mlabs-haskell/mlabs-pab -bug-reports: https://github.com/mlabs-haskell/mlabs-pab +homepage: https://github.com/mlabs-haskell/bot-plutus-interface +bug-reports: https://github.com/mlabs-haskell/bot-plutus-interface license: license-file: author: MLabs @@ -18,7 +18,7 @@ extra-source-files: README.md source-repository head type: git - location: https://github.com/mlabs-haskell/mlabs-pab + location: https://github.com/mlabs-haskell/bot-plutus-interface -- Common sections @@ -75,17 +75,17 @@ common common-lang library import: common-lang exposed-modules: - MLabsPAB - MLabsPAB.CardanoCLI - MLabsPAB.ChainIndex - MLabsPAB.Contract - MLabsPAB.Effects - MLabsPAB.Files - MLabsPAB.PreBalance - MLabsPAB.Types - MLabsPAB.UtxoParser + BotPlutusInterface + BotPlutusInterface.CardanoCLI + BotPlutusInterface.ChainIndex + BotPlutusInterface.Contract + BotPlutusInterface.Effects + BotPlutusInterface.Files + BotPlutusInterface.PreBalance + BotPlutusInterface.Types + BotPlutusInterface.UtxoParser - other-modules: MLabsPAB.Server + other-modules: BotPlutusInterface.Server build-depends: , aeson ^>=1.5.0.0 , attoparsec >=0.13.2.2 @@ -134,15 +134,15 @@ library hs-source-dirs: src -test-suite mlabs-pab-test +test-suite bot-plutus-interface-test import: common-lang type: exitcode-stdio-1.0 main-is: Spec.hs ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors other-modules: - Spec.MLabsPAB.Contract - Spec.MLabsPAB.PreBalance - Spec.MLabsPAB.UtxoParser + Spec.BotPlutusInterface.Contract + Spec.BotPlutusInterface.PreBalance + Spec.BotPlutusInterface.UtxoParser Spec.MockContract build-depends: @@ -150,6 +150,7 @@ test-suite mlabs-pab-test , attoparsec , base , base-compat + , bot-plutus-interface , bytestring ^>=0.10.12.0 , cardano-api , cardano-crypto-class @@ -162,7 +163,6 @@ test-suite mlabs-pab-test , freer-simple , generic-arbitrary , lens - , mlabs-pab , neat-interpolation , plutus-chain-index , plutus-chain-index-core diff --git a/examples/plutus-game/app/Main.hs b/examples/plutus-game/app/Main.hs index b9854ead..78231bfd 100644 --- a/examples/plutus-game/app/Main.hs +++ b/examples/plutus-game/app/Main.hs @@ -13,8 +13,8 @@ import Cardano.PlutusExample.Game ( import Data.Aeson qualified as JSON import Data.Aeson.TH (defaultOptions, deriveJSON) import Data.ByteString.Lazy qualified as LazyByteString -import MLabsPAB qualified -import MLabsPAB.Types ( +import BotPlutusInterface qualified +import BotPlutusInterface.Types ( CLILocation (Local), HasDefinitions (..), LogLevel (Debug), @@ -62,4 +62,4 @@ main = do , pcLogLevel = Debug , pcProtocolParamsFile = "./protocol.json" } - MLabsPAB.runPAB @GameContracts pabConf + BotPlutusInterface.runPAB @GameContracts pabConf diff --git a/examples/plutus-game/plutus-game.cabal b/examples/plutus-game/plutus-game.cabal index d53d336a..5537136f 100644 --- a/examples/plutus-game/plutus-game.cabal +++ b/examples/plutus-game/plutus-game.cabal @@ -3,8 +3,8 @@ name: plutus-game version: 0.1.0.0 synopsis: Game example description: Game example running on the fake pab -homepage: https://github.com/mlabs-haskell/mlabs-pab -bug-reports: https://github.com/mlabs-haskell/mlabs-pab +homepage: https://github.com/mlabs-haskell/bot-plutus-interface +bug-reports: https://github.com/mlabs-haskell/bot-plutus-interface license: license-file: author: MLabs @@ -16,7 +16,7 @@ extra-source-files: README.md source-repository head type: git - location: https://github.com/mlabs-haskell/mlabs-pab + location: https://github.com/mlabs-haskell/bot-plutus-interface -- Common sections @@ -124,10 +124,10 @@ library executable plutus-game-pab import: common-lang build-depends: - , aeson ^>=1.5.0.0 + , aeson ^>=1.5.0.0 + , bot-plutus-interface , bytestring , cardano-api - , mlabs-pab , playground-common , plutus-game , plutus-ledger diff --git a/examples/plutus-nft/app/Main.hs b/examples/plutus-nft/app/Main.hs index 66af3c79..2e9b4375 100644 --- a/examples/plutus-nft/app/Main.hs +++ b/examples/plutus-nft/app/Main.hs @@ -12,8 +12,8 @@ import Data.Aeson qualified as JSON import Data.Aeson.TH (defaultOptions, deriveJSON) import Data.ByteString.Lazy qualified as LazyByteString import Ledger.Value (TokenName) -import MLabsPAB qualified -import MLabsPAB.Types ( +import BotPlutusInterface qualified +import BotPlutusInterface.Types ( CLILocation (Local), HasDefinitions (..), LogLevel (Debug), @@ -62,4 +62,4 @@ main = do , pcLogLevel = Debug , pcProtocolParamsFile = "./protocol.json" } - MLabsPAB.runPAB @MintNFTContracts pabConf + BotPlutusInterface.runPAB @MintNFTContracts pabConf diff --git a/examples/plutus-nft/plutus-nft.cabal b/examples/plutus-nft/plutus-nft.cabal index 3d8b2b58..18a1206d 100644 --- a/examples/plutus-nft/plutus-nft.cabal +++ b/examples/plutus-nft/plutus-nft.cabal @@ -3,8 +3,8 @@ name: plutus-nft version: 0.1.0.0 synopsis: NFT example description: NFT example running on the fake pab -homepage: https://github.com/mlabs-haskell/mlabs-pab -bug-reports: https://github.com/mlabs-haskell/mlabs-pab +homepage: https://github.com/mlabs-haskell/bot-plutus-interface +bug-reports: https://github.com/mlabs-haskell/bot-plutus-interface license: license-file: author: MLabs @@ -16,7 +16,7 @@ extra-source-files: README.md source-repository head type: git - location: https://github.com/mlabs-haskell/mlabs-pab + location: https://github.com/mlabs-haskell/bot-plutus-interface -- Common sections @@ -124,10 +124,10 @@ library executable plutus-nft-pab import: common-lang build-depends: - , aeson ^>=1.5.0.0 + , aeson ^>=1.5.0.0 + , bot-plutus-interface , bytestring , cardano-api - , mlabs-pab , playground-common , plutus-ledger , plutus-nft diff --git a/flake.nix b/flake.nix index 5297a526..19c028ca 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "mlabs-pab"; + description = "bot-plutus-interface"; inputs.haskell-nix.url = "github:input-output-hk/haskell.nix"; inputs.nixpkgs.follows = "haskell-nix/nixpkgs-unstable"; diff --git a/hie.yaml b/hie.yaml index e264486a..95862748 100644 --- a/hie.yaml +++ b/hie.yaml @@ -1,10 +1,10 @@ cradle: cabal: - path: "./src" - component: "lib:mlabs-pab" + component: "lib:bot-plutus-interface" - path: "./test" - component: "test:mlabs-pab-test" + component: "test:bot-plutus-interface-test" - path: "./examples/plutus-nft/src" component: "lib:plutus-nft" diff --git a/src/MLabsPAB.hs b/src/BotPlutusInterface.hs similarity index 67% rename from src/MLabsPAB.hs rename to src/BotPlutusInterface.hs index b86babdd..750199aa 100644 --- a/src/MLabsPAB.hs +++ b/src/BotPlutusInterface.hs @@ -1,18 +1,18 @@ {-# LANGUAGE AllowAmbiguousTypes #-} -module MLabsPAB (runPAB) where +module BotPlutusInterface (runPAB) where import Data.Aeson (FromJSON) import Data.Kind (Type) -import MLabsPAB.Server qualified as Server -import MLabsPAB.Types (PABConfig (..)) +import BotPlutusInterface.Server qualified as Server +import BotPlutusInterface.Types (PABConfig (..)) import Network.Wai.Handler.Warp (run) import Plutus.PAB.Effects.Contract.Builtin (HasDefinitions) import Prelude runPAB :: forall (t :: Type). (HasDefinitions t, FromJSON t) => PABConfig -> IO () runPAB pabConf = do - putStrLn "Starting MLabsPAB server" + putStrLn "Starting BotPlutusInterface server" state <- Server.initState run pabConf.pcPort (Server.app @t pabConf state) diff --git a/src/MLabsPAB/CardanoCLI.hs b/src/BotPlutusInterface/CardanoCLI.hs similarity index 98% rename from src/MLabsPAB/CardanoCLI.hs rename to src/BotPlutusInterface/CardanoCLI.hs index 81ba949b..1ebd9d95 100644 --- a/src/MLabsPAB/CardanoCLI.hs +++ b/src/BotPlutusInterface/CardanoCLI.hs @@ -1,7 +1,7 @@ {-# LANGUAGE AllowAmbiguousTypes #-} {-# LANGUAGE NamedFieldPuns #-} -module MLabsPAB.CardanoCLI ( +module BotPlutusInterface.CardanoCLI ( BuildMode (..), submitTx, calculateMinUtxo, @@ -54,8 +54,8 @@ import Ledger.Tx ( import Ledger.TxId (TxId (..)) import Ledger.Value (Value) import Ledger.Value qualified as Value -import MLabsPAB.Effects (PABEffect, ShellArgs (..), callCommand, uploadDir) -import MLabsPAB.Files ( +import BotPlutusInterface.Effects (PABEffect, ShellArgs (..), callCommand, uploadDir) +import BotPlutusInterface.Files ( datumJsonFilePath, policyScriptFilePath, redeemerJsonFilePath, @@ -63,8 +63,8 @@ import MLabsPAB.Files ( txFilePath, validatorScriptFilePath, ) -import MLabsPAB.Types (PABConfig) -import MLabsPAB.UtxoParser qualified as UtxoParser +import BotPlutusInterface.Types (PABConfig) +import BotPlutusInterface.UtxoParser qualified as UtxoParser import Plutus.Contract.CardanoAPI (toCardanoAddress) import Plutus.V1.Ledger.Api ( BuiltinData, diff --git a/src/MLabsPAB/ChainIndex.hs b/src/BotPlutusInterface/ChainIndex.hs similarity index 96% rename from src/MLabsPAB/ChainIndex.hs rename to src/BotPlutusInterface/ChainIndex.hs index 426d02f1..3e6de856 100644 --- a/src/MLabsPAB/ChainIndex.hs +++ b/src/BotPlutusInterface/ChainIndex.hs @@ -1,9 +1,9 @@ {-# LANGUAGE NamedFieldPuns #-} -module MLabsPAB.ChainIndex (handleChainIndexReq) where +module BotPlutusInterface.ChainIndex (handleChainIndexReq) where import Data.Kind (Type) -import MLabsPAB.Types (PABConfig) +import BotPlutusInterface.Types (PABConfig) import Network.HTTP.Client (defaultManagerSettings, newManager) import Network.HTTP.Types (Status (statusCode)) import Plutus.ChainIndex.Api (UtxoAtAddressRequest (UtxoAtAddressRequest), UtxoWithCurrencyRequest (UtxoWithCurrencyRequest)) diff --git a/src/MLabsPAB/Contract.hs b/src/BotPlutusInterface/Contract.hs similarity index 95% rename from src/MLabsPAB/Contract.hs rename to src/BotPlutusInterface/Contract.hs index 35a8e2d7..c53665db 100644 --- a/src/MLabsPAB/Contract.hs +++ b/src/BotPlutusInterface/Contract.hs @@ -1,7 +1,7 @@ {-# LANGUAGE AllowAmbiguousTypes #-} {-# LANGUAGE RankNTypes #-} -module MLabsPAB.Contract (runContract, handleContract) where +module BotPlutusInterface.Contract (runContract, handleContract) where import Control.Lens ((^.)) import Control.Monad.Freer (Eff, Member, interpret, reinterpret, runM, subsume, type (~>)) @@ -17,8 +17,8 @@ import Data.Text qualified as Text import Ledger.Constraints.OffChain (UnbalancedTx (..)) import Ledger.Tx (CardanoTx) import Ledger.Tx qualified as Tx -import MLabsPAB.CardanoCLI qualified as CardanoCLI -import MLabsPAB.Effects ( +import BotPlutusInterface.CardanoCLI qualified as CardanoCLI +import BotPlutusInterface.Effects ( PABEffect, createDirectoryIfMissing, handlePABEffect, @@ -26,9 +26,9 @@ import MLabsPAB.Effects ( printLog, queryChainIndex, ) -import MLabsPAB.Files qualified as Files -import MLabsPAB.PreBalance qualified as PreBalance -import MLabsPAB.Types (ContractEnvironment (..), LogLevel (Debug)) +import BotPlutusInterface.Files qualified as Files +import BotPlutusInterface.PreBalance qualified as PreBalance +import BotPlutusInterface.Types (ContractEnvironment (..), LogLevel (Debug)) import Plutus.ChainIndex.Types (RollbackState (Committed), TxValidity (..)) import Plutus.Contract.Checkpoint (Checkpoint (..)) import Plutus.Contract.Effects ( diff --git a/src/MLabsPAB/Effects.hs b/src/BotPlutusInterface/Effects.hs similarity index 98% rename from src/MLabsPAB/Effects.hs rename to src/BotPlutusInterface/Effects.hs index 152c80b2..ff53f7b2 100644 --- a/src/MLabsPAB/Effects.hs +++ b/src/BotPlutusInterface/Effects.hs @@ -2,7 +2,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RankNTypes #-} -module MLabsPAB.Effects ( +module BotPlutusInterface.Effects ( PABEffect (..), ShellArgs (..), handlePABEffect, @@ -31,8 +31,8 @@ import Data.Aeson qualified as JSON import Data.Kind (Type) import Data.Text (Text) import Data.Text qualified as Text -import MLabsPAB.ChainIndex (handleChainIndexReq) -import MLabsPAB.Types ( +import BotPlutusInterface.ChainIndex (handleChainIndexReq) +import BotPlutusInterface.Types ( CLILocation (..), ContractEnvironment, ContractState (ContractState), diff --git a/src/MLabsPAB/Files.hs b/src/BotPlutusInterface/Files.hs similarity index 98% rename from src/MLabsPAB/Files.hs rename to src/BotPlutusInterface/Files.hs index 29a93852..d3cf542e 100644 --- a/src/MLabsPAB/Files.hs +++ b/src/BotPlutusInterface/Files.hs @@ -1,6 +1,6 @@ {-# LANGUAGE AllowAmbiguousTypes #-} -module MLabsPAB.Files ( +module BotPlutusInterface.Files ( policyScriptFilePath, validatorScriptFilePath, readPrivateKeys, @@ -54,7 +54,7 @@ import Ledger.Tx (Tx) import Ledger.Tx qualified as Tx import Ledger.TxId qualified as TxId import Ledger.Value qualified as Value -import MLabsPAB.Effects ( +import BotPlutusInterface.Effects ( PABEffect, createDirectoryIfMissing, listDirectory, @@ -62,7 +62,7 @@ import MLabsPAB.Effects ( writeFileJSON, writeFileTextEnvelope, ) -import MLabsPAB.Types (PABConfig) +import BotPlutusInterface.Types (PABConfig) import Plutus.V1.Ledger.Api ( CurrencySymbol, Datum (getDatum), diff --git a/src/MLabsPAB/PreBalance.hs b/src/BotPlutusInterface/PreBalance.hs similarity index 97% rename from src/MLabsPAB/PreBalance.hs rename to src/BotPlutusInterface/PreBalance.hs index e3048284..b7ba115a 100644 --- a/src/MLabsPAB/PreBalance.hs +++ b/src/BotPlutusInterface/PreBalance.hs @@ -1,6 +1,6 @@ {-# LANGUAGE AllowAmbiguousTypes #-} -module MLabsPAB.PreBalance ( +module BotPlutusInterface.PreBalance ( preBalanceTx, preBalanceTxIO, ) where @@ -36,10 +36,10 @@ import Ledger.Tx ( import Ledger.Tx qualified as Tx import Ledger.Value (Value (Value), getValue) import Ledger.Value qualified as Value -import MLabsPAB.CardanoCLI qualified as CardanoCLI -import MLabsPAB.Effects (PABEffect, createDirectoryIfMissing, printLog) -import MLabsPAB.Files qualified as Files -import MLabsPAB.Types (LogLevel (Debug), PABConfig) +import BotPlutusInterface.CardanoCLI qualified as CardanoCLI +import BotPlutusInterface.Effects (PABEffect, createDirectoryIfMissing, printLog) +import BotPlutusInterface.Files qualified as Files +import BotPlutusInterface.Types (LogLevel (Debug), PABConfig) import Plutus.V1.Ledger.Api ( Credential (PubKeyCredential, ScriptCredential), CurrencySymbol (..), diff --git a/src/MLabsPAB/Server.hs b/src/BotPlutusInterface/Server.hs similarity index 98% rename from src/MLabsPAB/Server.hs rename to src/BotPlutusInterface/Server.hs index da2e6937..ed4e6bc4 100644 --- a/src/MLabsPAB/Server.hs +++ b/src/BotPlutusInterface/Server.hs @@ -1,6 +1,6 @@ {-# LANGUAGE AllowAmbiguousTypes #-} -module MLabsPAB.Server (app, initState) where +module BotPlutusInterface.Server (app, initState) where import Control.Concurrent (ThreadId, forkIO) import Control.Concurrent.STM (TVar, atomically, modifyTVar, newTVarIO, readTVar, readTVarIO, retry) @@ -15,8 +15,8 @@ import Data.Maybe (catMaybes, fromMaybe) import Data.Proxy (Proxy (Proxy)) import Data.Row (Row) import Data.UUID.V4 qualified as UUID -import MLabsPAB.Contract (runContract) -import MLabsPAB.Types ( +import BotPlutusInterface.Contract (runContract) +import BotPlutusInterface.Types ( AppState (AppState), ContractEnvironment (..), ContractState (ContractState, csActivity, csObservableState), diff --git a/src/MLabsPAB/Types.hs b/src/BotPlutusInterface/Types.hs similarity index 98% rename from src/MLabsPAB/Types.hs rename to src/BotPlutusInterface/Types.hs index eb323bfa..ba4a970a 100644 --- a/src/MLabsPAB/Types.hs +++ b/src/BotPlutusInterface/Types.hs @@ -1,6 +1,6 @@ {-# LANGUAGE RankNTypes #-} -module MLabsPAB.Types ( +module BotPlutusInterface.Types ( PABConfig (..), CLILocation (..), AppState (AppState), diff --git a/src/MLabsPAB/UtxoParser.hs b/src/BotPlutusInterface/UtxoParser.hs similarity index 98% rename from src/MLabsPAB/UtxoParser.hs rename to src/BotPlutusInterface/UtxoParser.hs index dde3e396..7d4fdcb8 100644 --- a/src/MLabsPAB/UtxoParser.hs +++ b/src/BotPlutusInterface/UtxoParser.hs @@ -1,4 +1,4 @@ -module MLabsPAB.UtxoParser ( +module BotPlutusInterface.UtxoParser ( chainIndexTxOutParser, feeParser, utxoParser, diff --git a/test/Spec.hs b/test/Spec.hs index 4a08b23a..866f076f 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,8 +1,8 @@ module Main (main) where -import Spec.MLabsPAB.Contract qualified -import Spec.MLabsPAB.PreBalance qualified -import Spec.MLabsPAB.UtxoParser qualified +import Spec.BotPlutusInterface.Contract qualified +import Spec.BotPlutusInterface.PreBalance qualified +import Spec.BotPlutusInterface.UtxoParser qualified import Test.Tasty (TestTree, defaultMain, testGroup) import Prelude @@ -17,8 +17,8 @@ main = defaultMain tests tests :: TestTree tests = testGroup - "MLabsPAB" - [ Spec.MLabsPAB.Contract.tests - , Spec.MLabsPAB.UtxoParser.tests - , Spec.MLabsPAB.PreBalance.tests + "BotPlutusInterface" + [ Spec.BotPlutusInterface.Contract.tests + , Spec.BotPlutusInterface.UtxoParser.tests + , Spec.BotPlutusInterface.PreBalance.tests ] diff --git a/test/Spec/MLabsPAB/Contract.hs b/test/Spec/BotPlutusInterface/Contract.hs similarity index 99% rename from test/Spec/MLabsPAB/Contract.hs rename to test/Spec/BotPlutusInterface/Contract.hs index 80fef693..7d1c367c 100644 --- a/test/Spec/MLabsPAB/Contract.hs +++ b/test/Spec/BotPlutusInterface/Contract.hs @@ -1,7 +1,7 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} -module Spec.MLabsPAB.Contract (tests) where +module Spec.BotPlutusInterface.Contract (tests) where import Cardano.Api (NetworkId (Mainnet)) import Control.Lens (ix, (&), (.~), (^.), (^?)) @@ -25,7 +25,7 @@ import Ledger.Tx (CardanoTx, TxOut (TxOut), TxOutRef (TxOutRef)) import Ledger.Tx qualified as Tx import Ledger.TxId qualified as TxId import Ledger.Value qualified as Value -import MLabsPAB.CardanoCLI (unsafeSerialiseAddress) +import BotPlutusInterface.CardanoCLI (unsafeSerialiseAddress) import NeatInterpolation (text) import Plutus.Contract (Contract (..), Endpoint, submitTx, submitTxConstraintsWith, tell, utxosAt) import PlutusTx qualified @@ -56,7 +56,7 @@ import Prelude tests :: TestTree tests = testGroup - "MLabsPAB.Contracts" + "BotPlutusInterface.Contracts" [ testCase "Send ada to address" sendAda , testCase "Support multiple signatories" multisigSupport , testCase "Send native tokens" sendTokens diff --git a/test/Spec/MLabsPAB/PreBalance.hs b/test/Spec/BotPlutusInterface/PreBalance.hs similarity index 96% rename from test/Spec/MLabsPAB/PreBalance.hs rename to test/Spec/BotPlutusInterface/PreBalance.hs index 8581f3aa..69f469a7 100644 --- a/test/Spec/MLabsPAB/PreBalance.hs +++ b/test/Spec/BotPlutusInterface/PreBalance.hs @@ -1,4 +1,4 @@ -module Spec.MLabsPAB.PreBalance (tests) where +module Spec.BotPlutusInterface.PreBalance (tests) where import Cardano.Api.Shelley (Lovelace (Lovelace), ProtocolParameters (protocolParamUTxOCostPerWord)) import Data.Default (def) @@ -11,7 +11,7 @@ import Ledger.CardanoWallet qualified as Wallet import Ledger.Crypto (PrivateKey, PubKeyHash) import Ledger.Tx (Tx (..), TxIn (..), TxInType (..), TxOut (..), TxOutRef (..)) import Ledger.Value qualified as Value -import MLabsPAB.PreBalance qualified as PreBalance +import BotPlutusInterface.PreBalance qualified as PreBalance import Test.Tasty (TestTree, testGroup) import Test.Tasty.HUnit (Assertion, testCase, (@?=)) import Prelude @@ -23,7 +23,7 @@ import Prelude tests :: TestTree tests = testGroup - "MLabsPAB.PreBalance" + "BotPlutusInterface.PreBalance" [ testCase "Add utxos to cover fees" addUtxosForFees , testCase "Add utxos to cover native tokens" addUtxosForNativeTokens , testCase "Add utxos to cover change min utxo" addUtxosForChange diff --git a/test/Spec/MLabsPAB/UtxoParser.hs b/test/Spec/BotPlutusInterface/UtxoParser.hs similarity index 97% rename from test/Spec/MLabsPAB/UtxoParser.hs rename to test/Spec/BotPlutusInterface/UtxoParser.hs index 1a782948..4dc7ee37 100644 --- a/test/Spec/MLabsPAB/UtxoParser.hs +++ b/test/Spec/BotPlutusInterface/UtxoParser.hs @@ -2,7 +2,7 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} -module Spec.MLabsPAB.UtxoParser (tests) where +module Spec.BotPlutusInterface.UtxoParser (tests) where import Data.Attoparsec.Text (parseOnly) import Data.Text (Text) @@ -14,7 +14,7 @@ import Ledger.Tx ( TxOutRef (TxOutRef), ) import Ledger.Value qualified as Value -import MLabsPAB.UtxoParser qualified as UtxoParser +import BotPlutusInterface.UtxoParser qualified as UtxoParser import NeatInterpolation (text) import Test.Tasty (TestTree, testGroup) import Test.Tasty.HUnit (Assertion, testCase, (@?=)) @@ -27,7 +27,7 @@ import Prelude tests :: TestTree tests = testGroup - "MLabsPAB.UtxoParser" + "BotPlutusInterface.UtxoParser" [ testCase "Without utxo" withoutUtxo , testCase "Single utxo, ada only" singleAdaOnly , testCase "Multiple utxos, ada only" multiAdaOnly diff --git a/test/Spec/MockContract.hs b/test/Spec/MockContract.hs index 1dc95fe4..9cb94cd1 100644 --- a/test/Spec/MockContract.hs +++ b/test/Spec/MockContract.hs @@ -81,11 +81,11 @@ import Ledger.Tx (TxOut (TxOut), TxOutRef (TxOutRef)) import Ledger.Tx qualified as Tx import Ledger.TxId (TxId (TxId)) import Ledger.Value qualified as Value -import MLabsPAB.CardanoCLI (unsafeSerialiseAddress) -import MLabsPAB.Contract (handleContract) -import MLabsPAB.Effects (PABEffect (..), ShellArgs (..)) -import MLabsPAB.Files qualified as Files -import MLabsPAB.Types ( +import BotPlutusInterface.CardanoCLI (unsafeSerialiseAddress) +import BotPlutusInterface.Contract (handleContract) +import BotPlutusInterface.Effects (PABEffect (..), ShellArgs (..)) +import BotPlutusInterface.Files qualified as Files +import BotPlutusInterface.Types ( ContractEnvironment (..), ContractState (ContractState, csActivity, csObservableState), LogLevel (..), From 473e1d32a9a823c6da7d5c46a8cd8d0c21208537 Mon Sep 17 00:00:00 2001 From: gege251 Date: Tue, 25 Jan 2022 09:41:01 +0100 Subject: [PATCH 2/2] Fix formatting --- examples/plutus-game/app/Main.hs | 18 ++++++++-------- examples/plutus-nft/app/Main.hs | 18 ++++++++-------- src/BotPlutusInterface.hs | 4 ++-- src/BotPlutusInterface/CardanoCLI.hs | 22 ++++++++++---------- src/BotPlutusInterface/ChainIndex.hs | 2 +- src/BotPlutusInterface/Contract.hs | 24 +++++++++++----------- src/BotPlutusInterface/Effects.hs | 14 ++++++------- src/BotPlutusInterface/Files.hs | 18 ++++++++-------- src/BotPlutusInterface/PreBalance.hs | 8 ++++---- src/BotPlutusInterface/Server.hs | 16 +++++++-------- test/Spec/BotPlutusInterface/Contract.hs | 2 +- test/Spec/BotPlutusInterface/PreBalance.hs | 2 +- test/Spec/BotPlutusInterface/UtxoParser.hs | 2 +- test/Spec/MockContract.hs | 20 +++++++++--------- 14 files changed, 85 insertions(+), 85 deletions(-) diff --git a/examples/plutus-game/app/Main.hs b/examples/plutus-game/app/Main.hs index 78231bfd..4338c7e9 100644 --- a/examples/plutus-game/app/Main.hs +++ b/examples/plutus-game/app/Main.hs @@ -2,6 +2,15 @@ module Main (main) where +import BotPlutusInterface qualified +import BotPlutusInterface.Types ( + CLILocation (Local), + HasDefinitions (..), + LogLevel (Debug), + PABConfig (..), + SomeBuiltin (..), + endpointsToSchemas, + ) import Cardano.Api (NetworkId (Testnet), NetworkMagic (..)) import Cardano.PlutusExample.Game ( GameSchema, @@ -13,15 +22,6 @@ import Cardano.PlutusExample.Game ( import Data.Aeson qualified as JSON import Data.Aeson.TH (defaultOptions, deriveJSON) import Data.ByteString.Lazy qualified as LazyByteString -import BotPlutusInterface qualified -import BotPlutusInterface.Types ( - CLILocation (Local), - HasDefinitions (..), - LogLevel (Debug), - PABConfig (..), - SomeBuiltin (..), - endpointsToSchemas, - ) import Playground.Types (FunctionSchema) import Schema (FormSchema) import Servant.Client.Core (BaseUrl (BaseUrl), Scheme (Http)) diff --git a/examples/plutus-nft/app/Main.hs b/examples/plutus-nft/app/Main.hs index 2e9b4375..c5f1ac5d 100644 --- a/examples/plutus-nft/app/Main.hs +++ b/examples/plutus-nft/app/Main.hs @@ -3,15 +3,6 @@ module Main (main) where -import Cardano.Api (NetworkId (Testnet), NetworkMagic (..)) -import Cardano.PlutusExample.NFT ( - NFTSchema, - mintNft, - ) -import Data.Aeson qualified as JSON -import Data.Aeson.TH (defaultOptions, deriveJSON) -import Data.ByteString.Lazy qualified as LazyByteString -import Ledger.Value (TokenName) import BotPlutusInterface qualified import BotPlutusInterface.Types ( CLILocation (Local), @@ -21,6 +12,15 @@ import BotPlutusInterface.Types ( SomeBuiltin (..), endpointsToSchemas, ) +import Cardano.Api (NetworkId (Testnet), NetworkMagic (..)) +import Cardano.PlutusExample.NFT ( + NFTSchema, + mintNft, + ) +import Data.Aeson qualified as JSON +import Data.Aeson.TH (defaultOptions, deriveJSON) +import Data.ByteString.Lazy qualified as LazyByteString +import Ledger.Value (TokenName) import Playground.Types (FunctionSchema) import Schema (FormSchema) import Servant.Client.Core (BaseUrl (BaseUrl), Scheme (Http)) diff --git a/src/BotPlutusInterface.hs b/src/BotPlutusInterface.hs index 750199aa..076c6723 100644 --- a/src/BotPlutusInterface.hs +++ b/src/BotPlutusInterface.hs @@ -2,10 +2,10 @@ module BotPlutusInterface (runPAB) where -import Data.Aeson (FromJSON) -import Data.Kind (Type) import BotPlutusInterface.Server qualified as Server import BotPlutusInterface.Types (PABConfig (..)) +import Data.Aeson (FromJSON) +import Data.Kind (Type) import Network.Wai.Handler.Warp (run) import Plutus.PAB.Effects.Contract.Builtin (HasDefinitions) import Prelude diff --git a/src/BotPlutusInterface/CardanoCLI.hs b/src/BotPlutusInterface/CardanoCLI.hs index 1ebd9d95..79bbdfed 100644 --- a/src/BotPlutusInterface/CardanoCLI.hs +++ b/src/BotPlutusInterface/CardanoCLI.hs @@ -15,6 +15,17 @@ module BotPlutusInterface.CardanoCLI ( utxosAt, ) where +import BotPlutusInterface.Effects (PABEffect, ShellArgs (..), callCommand, uploadDir) +import BotPlutusInterface.Files ( + datumJsonFilePath, + policyScriptFilePath, + redeemerJsonFilePath, + signingKeyFilePath, + txFilePath, + validatorScriptFilePath, + ) +import BotPlutusInterface.Types (PABConfig) +import BotPlutusInterface.UtxoParser qualified as UtxoParser import Cardano.Api.Shelley (NetworkId (Mainnet, Testnet), NetworkMagic (..), serialiseAddress) import Codec.Serialise qualified as Codec import Control.Monad.Freer (Eff, Member) @@ -54,17 +65,6 @@ import Ledger.Tx ( import Ledger.TxId (TxId (..)) import Ledger.Value (Value) import Ledger.Value qualified as Value -import BotPlutusInterface.Effects (PABEffect, ShellArgs (..), callCommand, uploadDir) -import BotPlutusInterface.Files ( - datumJsonFilePath, - policyScriptFilePath, - redeemerJsonFilePath, - signingKeyFilePath, - txFilePath, - validatorScriptFilePath, - ) -import BotPlutusInterface.Types (PABConfig) -import BotPlutusInterface.UtxoParser qualified as UtxoParser import Plutus.Contract.CardanoAPI (toCardanoAddress) import Plutus.V1.Ledger.Api ( BuiltinData, diff --git a/src/BotPlutusInterface/ChainIndex.hs b/src/BotPlutusInterface/ChainIndex.hs index 3e6de856..62dc479b 100644 --- a/src/BotPlutusInterface/ChainIndex.hs +++ b/src/BotPlutusInterface/ChainIndex.hs @@ -2,8 +2,8 @@ module BotPlutusInterface.ChainIndex (handleChainIndexReq) where -import Data.Kind (Type) import BotPlutusInterface.Types (PABConfig) +import Data.Kind (Type) import Network.HTTP.Client (defaultManagerSettings, newManager) import Network.HTTP.Types (Status (statusCode)) import Plutus.ChainIndex.Api (UtxoAtAddressRequest (UtxoAtAddressRequest), UtxoWithCurrencyRequest (UtxoWithCurrencyRequest)) diff --git a/src/BotPlutusInterface/Contract.hs b/src/BotPlutusInterface/Contract.hs index c53665db..5ffbbf59 100644 --- a/src/BotPlutusInterface/Contract.hs +++ b/src/BotPlutusInterface/Contract.hs @@ -3,6 +3,18 @@ module BotPlutusInterface.Contract (runContract, handleContract) where +import BotPlutusInterface.CardanoCLI qualified as CardanoCLI +import BotPlutusInterface.Effects ( + PABEffect, + createDirectoryIfMissing, + handlePABEffect, + logToContract, + printLog, + queryChainIndex, + ) +import BotPlutusInterface.Files qualified as Files +import BotPlutusInterface.PreBalance qualified as PreBalance +import BotPlutusInterface.Types (ContractEnvironment (..), LogLevel (Debug)) import Control.Lens ((^.)) import Control.Monad.Freer (Eff, Member, interpret, reinterpret, runM, subsume, type (~>)) import Control.Monad.Freer.Error (runError) @@ -17,18 +29,6 @@ import Data.Text qualified as Text import Ledger.Constraints.OffChain (UnbalancedTx (..)) import Ledger.Tx (CardanoTx) import Ledger.Tx qualified as Tx -import BotPlutusInterface.CardanoCLI qualified as CardanoCLI -import BotPlutusInterface.Effects ( - PABEffect, - createDirectoryIfMissing, - handlePABEffect, - logToContract, - printLog, - queryChainIndex, - ) -import BotPlutusInterface.Files qualified as Files -import BotPlutusInterface.PreBalance qualified as PreBalance -import BotPlutusInterface.Types (ContractEnvironment (..), LogLevel (Debug)) import Plutus.ChainIndex.Types (RollbackState (Committed), TxValidity (..)) import Plutus.Contract.Checkpoint (Checkpoint (..)) import Plutus.Contract.Effects ( diff --git a/src/BotPlutusInterface/Effects.hs b/src/BotPlutusInterface/Effects.hs index ff53f7b2..ed48c5a9 100644 --- a/src/BotPlutusInterface/Effects.hs +++ b/src/BotPlutusInterface/Effects.hs @@ -20,6 +20,13 @@ module BotPlutusInterface.Effects ( callCommand, ) where +import BotPlutusInterface.ChainIndex (handleChainIndexReq) +import BotPlutusInterface.Types ( + CLILocation (..), + ContractEnvironment, + ContractState (ContractState), + LogLevel (..), + ) import Cardano.Api (AsType, FileError, HasTextEnvelope, TextEnvelopeDescr, TextEnvelopeError) import Cardano.Api qualified import Control.Concurrent qualified as Concurrent @@ -31,13 +38,6 @@ import Data.Aeson qualified as JSON import Data.Kind (Type) import Data.Text (Text) import Data.Text qualified as Text -import BotPlutusInterface.ChainIndex (handleChainIndexReq) -import BotPlutusInterface.Types ( - CLILocation (..), - ContractEnvironment, - ContractState (ContractState), - LogLevel (..), - ) import Plutus.Contract.Effects (ChainIndexQuery, ChainIndexResponse) import Plutus.PAB.Core.ContractInstance.STM (Activity) import System.Directory qualified as Directory diff --git a/src/BotPlutusInterface/Files.hs b/src/BotPlutusInterface/Files.hs index d3cf542e..ebbdadda 100644 --- a/src/BotPlutusInterface/Files.hs +++ b/src/BotPlutusInterface/Files.hs @@ -17,6 +17,15 @@ module BotPlutusInterface.Files ( writeDatumJsonFile, ) where +import BotPlutusInterface.Effects ( + PABEffect, + createDirectoryIfMissing, + listDirectory, + readFileTextEnvelope, + writeFileJSON, + writeFileTextEnvelope, + ) +import BotPlutusInterface.Types (PABConfig) import Cardano.Api ( AsType (AsPaymentKey, AsSigningKey), FileError, @@ -54,15 +63,6 @@ import Ledger.Tx (Tx) import Ledger.Tx qualified as Tx import Ledger.TxId qualified as TxId import Ledger.Value qualified as Value -import BotPlutusInterface.Effects ( - PABEffect, - createDirectoryIfMissing, - listDirectory, - readFileTextEnvelope, - writeFileJSON, - writeFileTextEnvelope, - ) -import BotPlutusInterface.Types (PABConfig) import Plutus.V1.Ledger.Api ( CurrencySymbol, Datum (getDatum), diff --git a/src/BotPlutusInterface/PreBalance.hs b/src/BotPlutusInterface/PreBalance.hs index b7ba115a..38ee1ee8 100644 --- a/src/BotPlutusInterface/PreBalance.hs +++ b/src/BotPlutusInterface/PreBalance.hs @@ -5,6 +5,10 @@ module BotPlutusInterface.PreBalance ( preBalanceTxIO, ) where +import BotPlutusInterface.CardanoCLI qualified as CardanoCLI +import BotPlutusInterface.Effects (PABEffect, createDirectoryIfMissing, printLog) +import BotPlutusInterface.Files qualified as Files +import BotPlutusInterface.Types (LogLevel (Debug), PABConfig) import Cardano.Api.Shelley (Lovelace (Lovelace), ProtocolParameters (protocolParamUTxOCostPerWord)) import Control.Monad (foldM, void, zipWithM) import Control.Monad.Freer (Eff, Member) @@ -36,10 +40,6 @@ import Ledger.Tx ( import Ledger.Tx qualified as Tx import Ledger.Value (Value (Value), getValue) import Ledger.Value qualified as Value -import BotPlutusInterface.CardanoCLI qualified as CardanoCLI -import BotPlutusInterface.Effects (PABEffect, createDirectoryIfMissing, printLog) -import BotPlutusInterface.Files qualified as Files -import BotPlutusInterface.Types (LogLevel (Debug), PABConfig) import Plutus.V1.Ledger.Api ( Credential (PubKeyCredential, ScriptCredential), CurrencySymbol (..), diff --git a/src/BotPlutusInterface/Server.hs b/src/BotPlutusInterface/Server.hs index ed4e6bc4..0f242ac5 100644 --- a/src/BotPlutusInterface/Server.hs +++ b/src/BotPlutusInterface/Server.hs @@ -2,6 +2,14 @@ module BotPlutusInterface.Server (app, initState) where +import BotPlutusInterface.Contract (runContract) +import BotPlutusInterface.Types ( + AppState (AppState), + ContractEnvironment (..), + ContractState (ContractState, csActivity, csObservableState), + PABConfig, + SomeContractState (SomeContractState), + ) import Control.Concurrent (ThreadId, forkIO) import Control.Concurrent.STM (TVar, atomically, modifyTVar, newTVarIO, readTVar, readTVarIO, retry) import Control.Monad (forever, guard, unless, void) @@ -15,14 +23,6 @@ import Data.Maybe (catMaybes, fromMaybe) import Data.Proxy (Proxy (Proxy)) import Data.Row (Row) import Data.UUID.V4 qualified as UUID -import BotPlutusInterface.Contract (runContract) -import BotPlutusInterface.Types ( - AppState (AppState), - ContractEnvironment (..), - ContractState (ContractState, csActivity, csObservableState), - PABConfig, - SomeContractState (SomeContractState), - ) import Network.WebSockets ( Connection, PendingConnection, diff --git a/test/Spec/BotPlutusInterface/Contract.hs b/test/Spec/BotPlutusInterface/Contract.hs index 7d1c367c..c53cd49c 100644 --- a/test/Spec/BotPlutusInterface/Contract.hs +++ b/test/Spec/BotPlutusInterface/Contract.hs @@ -3,6 +3,7 @@ module Spec.BotPlutusInterface.Contract (tests) where +import BotPlutusInterface.CardanoCLI (unsafeSerialiseAddress) import Cardano.Api (NetworkId (Mainnet)) import Control.Lens (ix, (&), (.~), (^.), (^?)) import Data.Aeson (ToJSON) @@ -25,7 +26,6 @@ import Ledger.Tx (CardanoTx, TxOut (TxOut), TxOutRef (TxOutRef)) import Ledger.Tx qualified as Tx import Ledger.TxId qualified as TxId import Ledger.Value qualified as Value -import BotPlutusInterface.CardanoCLI (unsafeSerialiseAddress) import NeatInterpolation (text) import Plutus.Contract (Contract (..), Endpoint, submitTx, submitTxConstraintsWith, tell, utxosAt) import PlutusTx qualified diff --git a/test/Spec/BotPlutusInterface/PreBalance.hs b/test/Spec/BotPlutusInterface/PreBalance.hs index 69f469a7..107d4d5c 100644 --- a/test/Spec/BotPlutusInterface/PreBalance.hs +++ b/test/Spec/BotPlutusInterface/PreBalance.hs @@ -1,5 +1,6 @@ module Spec.BotPlutusInterface.PreBalance (tests) where +import BotPlutusInterface.PreBalance qualified as PreBalance import Cardano.Api.Shelley (Lovelace (Lovelace), ProtocolParameters (protocolParamUTxOCostPerWord)) import Data.Default (def) import Data.Map qualified as Map @@ -11,7 +12,6 @@ import Ledger.CardanoWallet qualified as Wallet import Ledger.Crypto (PrivateKey, PubKeyHash) import Ledger.Tx (Tx (..), TxIn (..), TxInType (..), TxOut (..), TxOutRef (..)) import Ledger.Value qualified as Value -import BotPlutusInterface.PreBalance qualified as PreBalance import Test.Tasty (TestTree, testGroup) import Test.Tasty.HUnit (Assertion, testCase, (@?=)) import Prelude diff --git a/test/Spec/BotPlutusInterface/UtxoParser.hs b/test/Spec/BotPlutusInterface/UtxoParser.hs index 4dc7ee37..53ee5650 100644 --- a/test/Spec/BotPlutusInterface/UtxoParser.hs +++ b/test/Spec/BotPlutusInterface/UtxoParser.hs @@ -4,6 +4,7 @@ module Spec.BotPlutusInterface.UtxoParser (tests) where +import BotPlutusInterface.UtxoParser qualified as UtxoParser import Data.Attoparsec.Text (parseOnly) import Data.Text (Text) import Ledger qualified @@ -14,7 +15,6 @@ import Ledger.Tx ( TxOutRef (TxOutRef), ) import Ledger.Value qualified as Value -import BotPlutusInterface.UtxoParser qualified as UtxoParser import NeatInterpolation (text) import Test.Tasty (TestTree, testGroup) import Test.Tasty.HUnit (Assertion, testCase, (@?=)) diff --git a/test/Spec/MockContract.hs b/test/Spec/MockContract.hs index 9cb94cd1..e4c01b72 100644 --- a/test/Spec/MockContract.hs +++ b/test/Spec/MockContract.hs @@ -32,6 +32,16 @@ module Spec.MockContract ( utxos, ) where +import BotPlutusInterface.CardanoCLI (unsafeSerialiseAddress) +import BotPlutusInterface.Contract (handleContract) +import BotPlutusInterface.Effects (PABEffect (..), ShellArgs (..)) +import BotPlutusInterface.Files qualified as Files +import BotPlutusInterface.Types ( + ContractEnvironment (..), + ContractState (ContractState, csActivity, csObservableState), + LogLevel (..), + PABConfig (..), + ) import Cardano.Api ( AsType, FileError (FileError, FileIOError), @@ -81,16 +91,6 @@ import Ledger.Tx (TxOut (TxOut), TxOutRef (TxOutRef)) import Ledger.Tx qualified as Tx import Ledger.TxId (TxId (TxId)) import Ledger.Value qualified as Value -import BotPlutusInterface.CardanoCLI (unsafeSerialiseAddress) -import BotPlutusInterface.Contract (handleContract) -import BotPlutusInterface.Effects (PABEffect (..), ShellArgs (..)) -import BotPlutusInterface.Files qualified as Files -import BotPlutusInterface.Types ( - ContractEnvironment (..), - ContractState (ContractState, csActivity, csObservableState), - LogLevel (..), - PABConfig (..), - ) import NeatInterpolation (text) import Plutus.ChainIndex.Types (BlockId (..), Tip (..)) import Plutus.Contract (Contract (Contract))