better bfx error type

Author: functora

prv

@@ -9,7 +9,6 @@ import qualified Bfx.Data.FeeSummary as FeeSummary
 import Bfx.Data.Kind
 import Bfx.Data.Type
 import qualified Bfx.Data.Wallets as Wallets
-import Bfx.Data.Web
 import Bfx.Math
 import Bfx.Parser
 import Data.Aeson.Lens

pub/bfx/src/Bfx/Class/FromRpc.hs

@@ -31,6 +31,7 @@ module Bfx.Data.Type
 
     -- * Misc
     -- $misc
+    RawResponse (..),
     PltStatus (..),
     Error (..),
     emptyReq,
@@ -412,6 +413,18 @@ data Ticker = Ticker
 -- $misc
 -- General utility data used elsewhere.
 
+newtype RawResponse = RawResponse
+  { unRawResponse :: BL.ByteString
+  }
+  deriving stock
+    ( Eq,
+      Ord,
+      Show,
+      Read,
+      Data,
+      Generic
+    )
+
 data PltStatus
   = PltOperative
   | PltMaintenance
@@ -424,8 +437,8 @@ data PltStatus
 
 data Error
   = ErrorWebException HttpException
-  | ErrorWebPub Web.Request (Web.Response BL.ByteString)
-  | ErrorWebPrv BL.ByteString Web.Request (Web.Response BL.ByteString)
+  | ErrorWebPub Web.Request RawResponse (Web.Response BL.ByteString)
+  | ErrorWebPrv BL.ByteString Web.Request RawResponse (Web.Response BL.ByteString)
   | ErrorParser Web.Request (Web.Response BL.ByteString) Text
   | ErrorMath Text
   | ErrorTryFrom SomeException

pub/bfx/src/Bfx/Data/Type.hs

@@ -5,7 +5,6 @@ module Bfx.Data.Web
     ApiKey (..),
     RequestMethod (..),
     BaseUrl (..),
-    RawResponse (..),
     Nonce,
     unNonce,
     NonceGen,
@@ -19,7 +18,6 @@ where
 import qualified Data.Aeson as A
 import qualified Data.Aeson.Types as A
 import qualified Data.ByteString as BS
-import qualified Data.ByteString.Lazy as BL
 import Functora.Cfg
 import Functora.Prelude
 import qualified Prelude
@@ -75,19 +73,6 @@ newtype BaseUrl = BaseUrl
       IsString
     )
 
-newtype RawResponse = RawResponse
-  { unRawResponse :: BL.ByteString
-  }
-  deriving newtype
-    ( Eq,
-      Ord,
-      Show
-    )
-  deriving stock
-    ( Data,
-      Generic
-    )
-
 newtype Nonce = Nonce
   { unNonce :: Natural
   }

pub/bfx/src/Bfx/Data/Web.hs

@@ -72,7 +72,7 @@ pub qs req = do
         $ fromRpc @method rawRes
     else
       throw
-        $ ErrorWebPub webReq1 webRes
+        $ ErrorWebPub webReq1 rawRes webRes
 
 prv ::
   forall method req res m.
@@ -135,7 +135,7 @@ prv env req = do
           $ fromRpc @method rawRes
       else
         throw
-          $ ErrorWebPrv reqBody webReq1 webRes
+          $ ErrorWebPrv reqBody webReq1 rawRes webRes
 
 sign ::
   PrvKey ->