Better error message when trying to generate address on icarus wallet.

Author: Piotr Stachyra

lib/byron/test/integration/Test/Integration/Byron/Scenario/API/Addresses.hs

@@ -172,9 +172,14 @@ scenario_ADDRESS_CREATE_02 = it title $ \ctx -> do
     w <- emptyIcarusWallet ctx
     let payload = Json [json| { "passphrase": "Secure Passphrase" }|]
     r <- request @(ApiAddress n) ctx (Link.postRandomAddress w) Default payload
-    verify r [ expectResponseCode @IO HTTP.status403 ]
+    verify r
+        [ expectResponseCode @IO HTTP.status403
+        , expectErrorMessage
+            "I cannot derive new address for this wallet type.\
+            \ Make sure to use Byron random wallet id."
+        ]
   where
-    title = "ADDRESS_CREATE_02 - Creation if forbidden on Icarus wallets"
+    title = "ADDRESS_CREATE_02 - Creation is forbidden on Icarus wallets"
 
 scenario_ADDRESS_CREATE_03
     :: forall (n :: NetworkDiscriminant) t.
@@ -250,6 +255,9 @@ scenario_ADDRESS_CREATE_06 = it title $ \ctx -> do
     r0 <- request @(ApiAddress n) ctx (Link.postRandomAddress w) Default payload
     verify r0 [ expectResponseCode @IO HTTP.status201 ]
     r1 <- request @(ApiAddress n) ctx (Link.postRandomAddress w) Default payload
-    verify r1 [ expectResponseCode @IO HTTP.status409 ]
+    verify r1
+        [ expectResponseCode @IO HTTP.status409
+        , expectErrorMessage "I already know of such address."
+        ]
   where
     title = "ADDRESS_CREATE_06 - Cannot create an address that already exists"

lib/core/src/Cardano/Wallet.hs

@@ -1764,6 +1764,7 @@ data ErrCreateRandomAddress
     = ErrIndexAlreadyExists (Index 'Hardened 'AddressK)
     | ErrCreateAddrNoSuchWallet ErrNoSuchWallet
     | ErrCreateAddrWithRootKey ErrWithRootKey
+    | ErrCreateAddressNotAByronWallet
     deriving (Generic, Eq, Show)
 
 {-------------------------------------------------------------------------------

lib/core/src/Cardano/Wallet/Api/Server.hs

@@ -702,7 +702,7 @@ byronServer byron icarus ntp =
     byronAddresses =
              (\wid s -> withLegacyLayer wid
                 (byron, postRandomAddress byron wid s)
-                (icarus, throwError err403)
+                (icarus, liftHandler $ throwE ErrCreateAddressNotAByronWallet)
              )
         :<|> (\wid s -> withLegacyLayer wid
                 (byron , listAddresses byron (const pure) wid s)
@@ -2381,6 +2381,11 @@ instance LiftHandler ErrCreateRandomAddress where
                 [ "I cannot derive a new unused address #", pretty (fromEnum ix)
                 , " because I already know of such address."
                 ]
+        ErrCreateAddressNotAByronWallet ->
+            apiError err403 InvalidWalletType $ mconcat
+                [ "I cannot derive new address for this wallet type."
+                , " Make sure to use Byron random wallet id."
+                ]
 
 instance LiftHandler (Request, ServerError) where
     handler (req, err@(ServerError code _ body headers))

lib/core/src/Cardano/Wallet/Api/Types.hs

@@ -629,6 +629,7 @@ data ApiErrorCode
     | NotImplemented
     | WalletNotResponding
     | AddressAlreadyExists
+    | InvalidWalletType
     deriving (Eq, Generic, Show)
 
 -- | Defines a point in time that can be formatted as and parsed from an