Merge branch 'master' of github.com:mlabs-haskell/bot-plutus-interface into gergely/raw-bytestring-tokennames

Author: szg251

src/BotPlutusInterface/Files.hs

@@ -8,6 +8,7 @@ module BotPlutusInterface.Files (
   readPrivateKeys,
   signingKeyFilePath,
   txFilePath,
+  txFileName,
   writeAll,
   writePolicyScriptFile,
   redeemerJsonFilePath,
@@ -83,7 +84,7 @@ import Plutus.V1.Ledger.Api (
  )
 import PlutusTx (ToData, toData)
 import PlutusTx.Builtins (fromBuiltin)
-import System.FilePath (takeExtension, (</>))
+import System.FilePath (replaceExtension, takeExtension, (</>))
 import Prelude
 
 -- | Filename of a minting policy script
@@ -116,7 +117,10 @@ signingKeyFilePath pabConf (PubKeyHash pubKeyHash) =
 txFilePath :: PABConfig -> Text -> Tx.Tx -> Text
 txFilePath pabConf ext tx =
   let txId = encodeByteString $ fromBuiltin $ TxId.getTxId $ Tx.txId tx
-   in pabConf.pcTxFileDir <> "/tx-" <> txId <> "." <> ext
+   in pabConf.pcTxFileDir <> "/" <> txFileName txId ext
+
+txFileName :: Text -> Text -> Text
+txFileName name ext = Text.pack $ replaceExtension ("tx-" <> Text.unpack name) (Text.unpack ext)
 
 -- | Compiles and writes a script file under the given folder
 writePolicyScriptFile ::

src/BotPlutusInterface/Server.hs

@@ -9,6 +9,7 @@ module BotPlutusInterface.Server (
 ) where
 
 import BotPlutusInterface.Contract (runContract)
+import BotPlutusInterface.Files (txFileName)
 import BotPlutusInterface.Types (
   AppState (AppState),
   ContractEnvironment (..),
@@ -59,7 +60,7 @@ import Servant.API (Capture, Get, JSON, Post, ReqBody, (:<|>) (..), (:>))
 import Servant.API.WebSocket (WebSocketPending)
 import Servant.Server (Application, Handler, Server, err404, serve)
 import System.Directory (canonicalizePath, doesFileExist, makeAbsolute)
-import System.FilePath (replaceExtension, takeDirectory, (</>))
+import System.FilePath (takeDirectory, (</>))
 import Wallet.Types (ContractInstanceId (..))
 import Prelude
 
@@ -83,8 +84,8 @@ type ActivateContractEndpoint a =
     :> Post '[JSON] ContractInstanceId -- Start a new instance.
 
 type RawTxEndpoint =
-  "rawTx"
-    :> Capture "hash" Text
+  "raw-tx"
+    :> Capture "txId" Text
     :> Get '[JSON] RawTx
 
 server :: HasDefinitions t => PABConfig -> AppState -> Server (API t)
@@ -234,15 +235,15 @@ handleContract pabConf state@(AppState st) contract = liftIO $ do
 
 -- | This handler will allow to retrieve raw transactions from the pcTxFileDir if pcEnableTxEndpoint is True
 rawTxHandler :: PABConfig -> Text -> Handler RawTx
-rawTxHandler config hash = do
+rawTxHandler config txId = do
   -- Check that endpoint is enabled
   assert config.pcEnableTxEndpoint
   -- Absolute path to pcTxFileDir that is specified in the config
   txFolderPath <- liftIO $ makeAbsolute (unpack config.pcTxFileDir)
 
   -- Add/Set .raw extension on path
   let suppliedPath :: FilePath
-      suppliedPath = replaceExtension (txFolderPath </> "tx-" <> unpack hash) ".raw"
+      suppliedPath = txFolderPath </> unpack (txFileName txId ".raw")
   -- Resolve path indirections
   path <- liftIO $ canonicalizePath suppliedPath
   -- ensure it does not try to escape txFolderPath

test/Spec/BotPlutusInterface/Server.hs

@@ -1,5 +1,6 @@
 module Spec.BotPlutusInterface.Server (tests) where
 
+import BotPlutusInterface.Files (txFileName)
 import BotPlutusInterface.Server (RawTxEndpoint, app, initState)
 import BotPlutusInterface.Types (
   HasDefinitions (..),
@@ -83,7 +84,7 @@ initServerAndClient config test = do
     let pabConfig :: PABConfig
         pabConfig = config {pcTxFileDir = pack path}
     state <- initState
-    LBS.writeFile (path </> txFileName) txFileContents
+    LBS.writeFile (path </> testTxFileName) txFileContents
     testWithApplication (pure $ app @EmptyContract pabConfig state) (initClientOnPort test)
   where
     initClientOnPort :: RawTxTest a -> Int -> IO a
@@ -102,8 +103,8 @@ initServerAndClient config test = do
 txHash :: Text
 txHash = "test"
 
-txFileName :: FilePath
-txFileName = "tx-" <> unpack txHash <> ".raw"
+testTxFileName :: FilePath
+testTxFileName = unpack $ txFileName txHash ".raw"
 
 rawTx :: RawTx
 rawTx =