Merge pull request #3619 from input-output-hk/KtorZ/DDW-318/fix-prett…

…y-encoding [DDW-318] Remove pretty-encoding for JSONValidationError
input-output-hk · Sep 18, 2018 · 71fca29 · 71fca29
2 parents 7ebfe13 + e169bd6
commit 71fca29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,8 @@
 - The creation of mnemonic doesn't throw anymore when provided words outside of the BIP39 English dictionnary.
   Instead, it returns an error value gracefully (CO-325)
 
+- Response from `JSONValidationError` are now also encoded inline (instead of a pretty-encoding with newlines) (DDW-318)
+
 ### Improvements
 
 - Friendly error mistakes from deserializing invalid addresses instead of brutal 500 (CBR-283)

diff --git a/wallet-new/src/Cardano/Wallet/API/Response.hs b/wallet-new/src/Cardano/Wallet/API/Response.hs
@@ -25,7 +25,6 @@ import           Universum (Buildable, Exception, Text, decodeUtf8, toText,
 
 import           Control.Lens hiding (Indexable)
 import           Data.Aeson (FromJSON (..), ToJSON (..), eitherDecode, encode)
-import           Data.Aeson.Encode.Pretty (encodePretty)
 import qualified Data.Aeson.Options as Serokell
 import           Data.Aeson.TH
 import qualified Data.Char as Char
@@ -225,7 +224,7 @@ data ValidJSON deriving Typeable
 
 instance FromJSON a => MimeUnrender ValidJSON a where
     mimeUnrender _ bs = case eitherDecode bs of
-        Left err -> Left $ decodeUtf8 $ encodePretty (JSONValidationFailed $ toText err)
+        Left err -> Left $ decodeUtf8 $ encode (JSONValidationFailed $ toText err)
         Right v  -> return v
 
 instance Accept ValidJSON where