Skip to content

Return the error cases in runTxSubmit #1226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 10, 2020
Merged

Return the error cases in runTxSubmit #1226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0651ee5
Return the error cases in runTxSubmit
intricate Jun 9, 2020
ede6a62
Implement renderTxSubmitResult
intricate Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cardano-api/src/Cardano/Api/TxSubmit.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ data TxSubmitResult
= TxSubmitSuccess
| TxSubmitFailureByron (ApplyTxErr ByronBlock)
| TxSubmitFailureShelley (ApplyTxErr (ShelleyBlock TPraosStandardCrypto))
deriving Show

submitTx
:: Network
Expand Down
12 changes: 7 additions & 5 deletions cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import Cardano.Config.Types (CertificateFile (..))
import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra
(bimapExceptT, firstExceptT, handleIOExceptT, hoistEither,
newExceptT, right)
left, newExceptT, right)

import qualified Data.Aeson as Aeson
import qualified Data.ByteString.Lazy.Char8 as LBS
Expand All @@ -45,6 +45,7 @@ data ShelleyTxCmdError
| ShelleyTxSignKeyError !KeyError
| ShelleyTxWriteSignedTxError !ApiError
| ShelleyTxWriteUnsignedTxError !ApiError
| ShelleyTxSubmitError !TxSubmitResult
deriving Show

renderShelleyTxCmdError :: ShelleyTxCmdError -> Text
Expand All @@ -69,6 +70,8 @@ renderShelleyTxCmdError err =
"Error while writing signed shelley tx: " <> renderApiError apiError
ShelleyTxWriteUnsignedTxError apiError ->
"Error while writing unsigned shelley tx: " <> renderApiError apiError
ShelleyTxSubmitError txSubmitRes ->
"Error while submitting Shelley tx: " <> textShow txSubmitRes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should write a renderTxSubmitError function here to provide more context with the errors vs just showing them.


runTransactionCmd :: TransactionCmd -> ExceptT ShelleyTxCmdError IO ()
runTransactionCmd cmd =
Expand Down Expand Up @@ -120,10 +123,9 @@ runTxSubmit txFp network = do
signedTx <- firstExceptT ShelleyTxReadSignedTxError . newExceptT $ readTxSigned txFp
result <- liftIO $ submitTx network sktFp signedTx
case result of
TxSubmitSuccess -> return ()
--TODO: use the Cardano.Api.TxSubmit.ErrorRender here
TxSubmitFailureByron err -> liftIO $ print err
TxSubmitFailureShelley err -> liftIO $ print err
TxSubmitSuccess -> return ()
TxSubmitFailureShelley _ -> left (ShelleyTxSubmitError result)
TxSubmitFailureByron _ -> left (ShelleyTxSubmitError result)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not odd that we're able to submit Byron transactions from this command?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should get sorted out as we flesh out the typed API


runTxCalculateMinFee
:: TxInCount
Expand Down