Fix build

cardano-foundation · Sep 24, 2020 · b4b2a12 · b4b2a12
1 parent 405c745
commit b4b2a12
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/lib/cli/test/unit/Cardano/CLISpec.hs b/lib/cli/test/unit/Cardano/CLISpec.hs
@@ -41,7 +41,7 @@ import Cardano.Wallet.Api.Client
 import Cardano.Wallet.Api.Types
     ( ApiT (..), ApiTxMetadata (..) )
 import Cardano.Wallet.Primitive.Types
-    ( TxMetadata (..), TxMetadataValue (..) )
+    ( PoolMetadataSource, TxMetadata (..), TxMetadataValue (..) )
 import Control.Concurrent
     ( forkFinally )
 import Control.Concurrent.MVar
@@ -54,8 +54,6 @@ import Data.Text
     ( Text )
 import Data.Text.Class
     ( FromText (..), TextDecodingError (..), toText )
-import Network.URI
-    ( parseURI )
 import Options.Applicative
     ( ParserInfo
     , ParserPrefs
@@ -652,8 +650,9 @@ spec = do
 
     describe "SMASH URL option" $ do
         let parse arg = execParserPure defaultPrefs
-                (info smashURLOption mempty) ["--smash-url", arg]
-        let ok arg (Success url) = Just url == parseURI arg
+                (info smashURLOption mempty) ["--pool-metadata-fetching", arg]
+        let ok arg (Success url) = Right url == fromText @PoolMetadataSource
+                (T.pack arg)
             ok _ _ = False
         let err _ (Failure _) = True
             err _ _ = False

diff --git a/lib/core/test/unit/Cardano/Wallet/Api/Malformed.hs b/lib/core/test/unit/Cardano/Wallet/Api/Malformed.hs
@@ -1000,7 +1000,7 @@ instance Malformed (BodyParam SettingsPutData) where
                           "pool_metadata_source": "not_a_uri"
                           }
             }|]
-          , "Error in $['pool_metadata_source]: Not a valid sync setting value"
+          , "Error in $.settings['pool_metadata_source']: Could not parse URI: not_a_uri"
           )
         ]
 

diff --git a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
@@ -1601,6 +1601,9 @@ instance ToSchema WalletPutData where
 instance ToSchema SettingsPutData where
     declareNamedSchema _ = declareSchemaForDefinition "ApiSettingsPutData"
 
+instance ToSchema (ApiT Settings) where
+    declareNamedSchema _ = declareSchemaForDefinition "ApiGetSettings"
+
 instance ToSchema WalletPutPassphraseData where
     declareNamedSchema _ =
         declareSchemaForDefinition "ApiWalletPutPassphraseData"

diff --git a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api/Server.hs b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api/Server.hs
@@ -44,6 +44,7 @@ import Cardano.Wallet.Api
     , Network
     , Proxy_
     , ShelleyMigrations
+    , Settings
     , StakePools
     , Transactions
     , Wallets
@@ -88,7 +89,10 @@ import Cardano.Wallet.Api.Server
     , withLegacyLayer'
     )
 import Cardano.Wallet.Api.Types
-    ( ApiErrorCode (..), ApiT (..), SomeByronWalletPostData (..) )
+    ( ApiErrorCode (..)
+    , ApiT (..)
+    , SomeByronWalletPostData (..)
+    )
 import Cardano.Wallet.Primitive.AddressDerivation
     ( DelegationAddress (..), NetworkDiscriminant (..), PaymentAddress )
 import Cardano.Wallet.Primitive.AddressDerivation.Byron
@@ -118,7 +122,7 @@ import Fmt
 import Network.Ntp
     ( NtpClient )
 import Servant
-    ( (:<|>) (..), Handler, Server, err501, err503, throwError )
+    ( (:<|>) (..), Handler (..), Server, err501, err503, throwError )
 import Type.Reflection
     ( Typeable )
 
@@ -153,6 +157,7 @@ server byron icarus jormungandr spl ntp =
     :<|> byronMigrations
     :<|> network
     :<|> proxy
+    :<|> settingS
   where
     wallets :: Server Wallets
     wallets = deleteWallet jormungandr
@@ -285,6 +290,9 @@ server byron icarus jormungandr spl ntp =
     proxy :: Server Proxy_
     proxy = postExternalTransaction jormungandr
 
+    settingS :: Server Settings
+    settingS = (\_ -> throwError err501) :<|> throwError err501
+
 
 --------------------------------------------------------------------------------
 -- List stake pools API handler