review changes

cardano-foundation · Oct 16, 2019 · b80eab9 · b80eab9
1 parent db35b3d
commit b80eab9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Api/Server.hs b/lib/core/src/Cardano/Wallet/Api/Server.hs
@@ -616,8 +616,7 @@ postExternalTransaction ctx (PostExternalTransactionData load) = do
 
 deleteTransaction
     :: forall ctx s t k.
-        ( s ~ SeqState t
-        , ctx ~ ApiLayer s t k
+        ( ctx ~ ApiLayer s t k
         , DefineTx t
         )
     => ctx
@@ -1270,8 +1269,8 @@ instance LiftHandler ErrForgetPendingTx where
         ErrForgetPendingTxNoSuchTransaction e -> handler e
         ErrForgetPendingTxTransactionIsNotPending tid ->
             apiError err404 TransactionNotPending $ mconcat
-                [ "The transaction with id : ", pretty tid,
-                  "cannot be forgotten as it is not pending anymore."
+                [ "The transaction with id : ", toText tid,
+                  " cannot be forgotten as it is not pending anymore."
                 ]
 
 instance LiftHandler ErrSubmitTx where

diff --git a/lib/core/src/Cardano/Wallet/Api/Types.hs b/lib/core/src/Cardano/Wallet/Api/Types.hs
@@ -737,12 +737,11 @@ instance MimeRender OctetStream PostExternalTransactionData where
    mimeRender _ (PostExternalTransactionData val) = BL.fromStrict val
 
 instance FromHttpApiData ApiTxId where
-    parseUrlPiece = first (T.pack . getTextDecodingError) . fromText
-
-instance FromText ApiTxId where
-    fromText txt = case fromText txt of
-        Left err -> Left $ TextDecodingError $ show err
-        Right tid -> Right $ ApiTxId $ ApiT tid
+    parseUrlPiece = first (T.pack . getTextDecodingError) . fromText'
+      where
+          fromText' txt = case fromText txt of
+              Left err -> Left $ TextDecodingError $ show err
+              Right tid -> Right $ ApiTxId $ ApiT tid
 
 instance ToHttpApiData ApiTxId where
     toUrlPiece (ApiTxId (ApiT tid)) = toText tid