[CO-325] Fix rebase issues

Weirdly, the conflict resolutions during rebase completely cut the end of some files in conflict.
I was using a new tool for solving merge-conflict. Gotta be more careful

Author: KtorZ

wallet-new/src/Cardano/Wallet/API/Response.hs

@@ -20,14 +20,10 @@ import           Cardano.Wallet.API.V1.Swagger.Example (Example, example)
 import           Control.Lens
 import           Data.Aeson
 import           Data.Aeson.Encode.Pretty (encodePretty)
-import qualified Data.Aeson.Options as Serokell
 import           Data.Aeson.TH
-import qualified Data.Char as Char
 import           Data.Swagger as S hiding (Example, example)
-import qualified Data.Text.Buildable
 import           Data.Typeable
 import           Formatting (bprint, build, (%))
-import qualified Formatting.Buildable
 import           GHC.Generics (Generic)
 import           Servant.API.ContentTypes (Accept (..), JSON, MimeRender (..),
                      MimeUnrender (..), OctetStream)
@@ -45,6 +41,11 @@ import           Cardano.Wallet.API.Response.Sort.IxSet as SortBackend
 import           Cardano.Wallet.API.V1.Errors
                      (WalletError (JSONValidationFailed))
 
+import qualified Data.Aeson.Options as Serokell
+import qualified Data.Char as Char
+import qualified Formatting.Buildable
+
+
 -- | Extra information associated with an HTTP response.
 data Metadata = Metadata
   { metaPagination   :: PaginationMetadata
@@ -66,6 +67,9 @@ instance Buildable Metadata where
   build Metadata{..} =
     bprint ("{ pagination="%build%" }") metaPagination
 
+instance Example Metadata
+
+
 -- | An `WalletResponse` models, unsurprisingly, a response (successful or not)
 -- produced by the wallet backend.
 -- Includes extra informations like pagination parameters etc.
@@ -112,6 +116,12 @@ instance Buildable a => Buildable (WalletResponse a) where
         wrMeta
         wrData
 
+instance Example a => Example (WalletResponse a) where
+    example = WalletResponse <$> example
+                             <*> pure SuccessStatus
+                             <*> example
+
+
 -- | Inefficient function to build a response out of a @generator@ function. When the data layer will
 -- be rewritten the obvious solution is to slice & dice the data as soon as possible (aka out of the DB), in this order:
 --
@@ -161,14 +171,28 @@ paginate PaginationParams{..} rawResultSet =
         slice                  = take pp . drop ((cp - 1) * pp)
     in (slice rawResultSet, metadata)
 
-instance Example Metadata
-instance Example a => Example (WalletResponse a) where
-    example = WalletResponse <$> example
-                             <*> pure SuccessStatus
-                             <*> example
-
 
 -- | Creates a 'WalletResponse' with just a single record into it.
 single :: a -> WalletResponse a
 single theData = WalletResponse {
       wrData   = theData
+    , wrStatus = SuccessStatus
+    , wrMeta   = Metadata (PaginationMetadata 1 (Page 1) (PerPage 1) 1)
+    }
+
+--
+-- Creating a better user experience when it comes to errors.
+--
+
+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)
+        Right v  -> return v
+
+instance Accept ValidJSON where
+    contentType _ = contentType (Proxy @ JSON)
+
+instance ToJSON a => MimeRender ValidJSON a where
+    mimeRender _ = mimeRender (Proxy @ JSON)

wallet-new/src/Cardano/Wallet/API/V1/Handlers/Accounts.hs

@@ -24,6 +24,8 @@ handlers w =  deleteAccount w
          :<|> newAccount w
          :<|> updateAccount w
          :<|> redeemAda w
+         :<|> getAccountAddresses w
+         :<|> getAccountBalance w
 
 deleteAccount :: PassiveWalletLayer IO
               -> WalletId
@@ -92,3 +94,21 @@ redeemAda :: PassiveWalletLayer IO
           -> Handler (WalletResponse Transaction)
 redeemAda _layer _wId _accIdx _redemption =
     error "unimplemented, see [CBR-349]"
+
+getAccountAddresses
+    :: PassiveWalletLayer IO
+    -> WalletId
+    -> AccountIndex
+    -> RequestParams
+    -> FilterOperations WalletAddress
+    -> Handler (WalletResponse AccountAddresses)
+getAccountAddresses _layer _wId _accIdx _pagination _filters =
+    error "unimplemented"
+
+getAccountBalance
+    :: PassiveWalletLayer IO
+    -> WalletId
+    -> AccountIndex
+    -> Handler (WalletResponse AccountBalance)
+getAccountBalance _layer _wId _accIdx =
+    error "unimplemented"

wallet-new/src/Cardano/Wallet/API/V1/LegacyHandlers/Accounts.hs

@@ -127,7 +127,9 @@ getAccountAddresses wId accIdx pagination filters = do
 
 getAccountBalance
     :: (V0.MonadWalletLogic ctx m)
-    => WalletId -> AccountIndex -> m (WalletResponse AccountBalance)
+    => WalletId
+    -> AccountIndex
+    -> m (WalletResponse AccountBalance)
 getAccountBalance wId accIdx = do
     resp <- getAccount wId accIdx
     return resp { wrData = AccountBalance . accAmount . wrData $ resp }

wallet-new/src/Cardano/Wallet/API/V1/Swagger/Example.hs

@@ -2,21 +2,13 @@ module Cardano.Wallet.API.V1.Swagger.Example where
 
 import           Universum
 
-import           Cardano.Wallet.API.Response
-import           Cardano.Wallet.API.V1.Types
-import qualified Cardano.Wallet.Kernel.DB.Util.IxSet as IxSet
-import           Data.Default (Default (def))
-import           Node (NodeId (..))
-
-import           Pos.Client.Txp.Util (InputSelectionPolicy (..))
 import           Test.QuickCheck (Arbitrary (..), Gen, listOf1)
 
 import           Cardano.Wallet.Orphans.Arbitrary ()
-import           Pos.Arbitrary.Wallet.Web.ClientTypes ()
 import           Pos.Wallet.Web.ClientTypes (CUpdateInfo)
 import           Pos.Wallet.Web.Methods.Misc (WalletStateSnapshot (..))
-import           Test.Pos.Wallet.Arbitrary.Web.ClientTypes ()
 
+import qualified Cardano.Wallet.Kernel.DB.Util.IxSet as IxSet
 import qualified Data.Map.Strict as Map
 
 

wallet-new/src/Cardano/Wallet/API/V1/Types.hs

@@ -1966,37 +1966,7 @@ type CaptureAccountId = Capture "accountId" AccountIndex
 -- Example typeclass instances
 --
 
-instance Example (V1 Core.PassPhrase)
-instance Example (V1 Core.Coin)
-
-instance Example a => Example (WalletResponse a) where
-    example = WalletResponse <$> example
-                             <*> pure SuccessStatus
-                             <*> example
-
--- | We have a specific 'Example' instance for @'V1' 'Address'@ because we want
--- to control the length of the examples. It is possible for the encoded length
--- to become huge, up to 1000+ bytes, if the 'UnsafeMultiKeyDistr' constructor
--- is used. We do not use this constructor, which keeps the address between
--- ~80-150 bytes long.
-instance Example (V1 Address) where
-    example = fmap V1 . Core.makeAddress
-        <$> arbitrary
-        <*> arbitraryAttributes
-      where
-        arbitraryAttributes =
-            Core.AddrAttributes
-                <$> arbitrary
-                <*> oneof
-                    [ pure Core.BootstrapEraDistr
-                    , Core.SingleKeyDistr <$> arbitrary
-                    ]
-
-instance Example BackupPhrase where
-    example = pure (BackupPhrase def)
-
-instance Example Address
-instance Example Metadata
+instance Example Core.Address
 instance Example AccountIndex
 instance Example AccountBalance
 instance Example AccountAddresses
@@ -2021,15 +1991,38 @@ instance Example NewAccount
 instance Example TimeInfo
 instance Example AddressValidity
 instance Example NewAddress
-instance Example CUpdateInfo
 instance Example SubscriptionStatus
 instance Example NodeId
+instance Example ShieldedRedemptionCode
+instance Example (V1 Core.PassPhrase)
+instance Example (V1 Core.Coin)
 
-instance Example InputSelectionPolicy where
-    example = pure OptimizeForHighThroughput
+-- | We have a specific 'Example' instance for @'V1' 'Address'@ because we want
+-- to control the length of the examples. It is possible for the encoded length
+-- to become huge, up to 1000+ bytes, if the 'UnsafeMultiKeyDistr' constructor
+-- is used. We do not use this constructor, which keeps the address between
+-- ~80-150 bytes long.
+instance Example (V1 Core.Address) where
+    example = fmap V1 . Core.makeAddress
+        <$> arbitrary
+        <*> arbitraryAttributes
+      where
+        arbitraryAttributes =
+            Core.AddrAttributes
+                <$> arbitrary
+                <*> oneof
+                    [ pure Core.BootstrapEraDistr
+                    , Core.SingleKeyDistr <$> arbitrary
+                    ]
 
-instance Example (V1 InputSelectionPolicy) where
-    example = pure (V1 OptimizeForHighThroughput)
+instance Example BackupPhrase where
+    example = pure (BackupPhrase def)
+
+instance Example Core.InputSelectionPolicy where
+    example = pure Core.OptimizeForHighThroughput
+
+instance Example (V1 Core.InputSelectionPolicy) where
+    example = pure (V1 Core.OptimizeForHighThroughput)
 
 instance Example Account where
     example = Account <$> example
@@ -2061,3 +2054,8 @@ instance Example Payment where
                       <*> example
                       <*> example -- TODO: will produce `Just groupingPolicy`
                       <*> example
+
+instance Example Redemption where
+    example = Redemption <$> example
+                         <*> pure Nothing
+                         <*> example

wallet-new/src/Cardano/Wallet/Client.hs

@@ -244,3 +244,38 @@ hoistClient phi wc = WalletClient
 -- 'WalletClient' m@.
 liftClient :: MonadIO m => WalletClient IO -> WalletClient m
 liftClient = hoistClient liftIO
+
+-- | Calls 'getWalletIndexPaged' using the 'Default' values for 'Page' and
+-- 'PerPage'.
+getWalletIndex :: Monad m => WalletClient m -> Resp m [Wallet]
+getWalletIndex = paginateAll . getWalletIndexPaged
+
+
+-- | A type alias shorthand for the response from the 'WalletClient'.
+type Resp m a = m (Either ClientError (WalletResponse a))
+
+-- | The type of errors that the wallet might return.
+data ClientError
+    = ClientWalletError V1Errors.WalletError
+    -- ^ The 'WalletError' type represents known failures that the API
+    -- might return.
+    | ClientHttpError ServantError
+    -- ^ We directly expose the 'ServantError' type as part of this
+    | UnknownClientError SomeException
+    -- ^ This constructor is used when the API client reports an error that
+    -- isn't represented in either the 'ServantError' HTTP errors or the
+    -- 'WalletError' for API errors.
+    deriving (Show, Generic)
+
+-- | General (and naive) equality instance.
+instance Eq ClientError where
+    ClientWalletError  e1 == ClientWalletError  e2 = e1 == e2
+    ClientHttpError    e1 == ClientHttpError    e2 = e1 == e2
+    UnknownClientError _  == UnknownClientError _  = True
+    _ == _ = False
+
+-- | General exception instance.
+instance Exception ClientError where
+    toException (ClientWalletError  e) = toException e
+    toException (ClientHttpError    e) = toException e
+    toException (UnknownClientError e) = toException e

wallet-new/src/Cardano/Wallet/Client/Http.hs

@@ -181,3 +181,11 @@ mkHttpClient baseUrl manager = WalletClient
         :<|> getTransactionIndexFilterSortsR
         :<|> getTransactionFeeR
         = transactionsAPI
+
+    addressesAPI
+        :<|> walletsAPI
+        :<|> accountsAPI
+        :<|> transactionsAPI
+        :<|> getNodeSettingsR
+        :<|> getNodeInfoR
+        = client (Proxy @("api" :> "v1" :> V1.API))