Merge pull request #3667 from input-output-hk/KtorZ/CO-394/remove-legacy-and-v0

[CO-394] Remove Legacy* and V0* stuff

Author: KtorZ

scripts/test/wallet/swaggerSchemaValidation.nix

@@ -13,9 +13,8 @@ let
   validate-json = "${iohkPkgs.validateJson}/bin/validate_json";
   schema = ./../../../tools/src/validate-json/swagger-meta-2.0.json;
 in pkgs.writeScript "validate-swagger-schema" ''
-  ${generate-swagger-file} --target wallet@v0 --output-file swagger.v0.json
   ${generate-swagger-file} --target wallet@v1 --output-file swagger.v1.json
-  ${validate-json} --schema ${schema} swagger.v0.json && ${validate-json} --schema ${schema} swagger.v1.json
+  ${validate-json} --schema ${schema} swagger.v1.json
   EXIT_STATUS=$?
   rm -f swagger.*.json
   exit $EXIT_STATUS

wallet-new/cardano-sl-wallet-new.cabal

@@ -16,12 +16,10 @@ cabal-version:       >=1.10
 library
   hs-source-dirs:      src
   exposed-modules:     Cardano.Wallet.Action
-                       Cardano.Wallet.LegacyAction
                        Cardano.Wallet.API
                        Cardano.Wallet.API.Indices
                        Cardano.Wallet.API.Internal
                        Cardano.Wallet.API.Internal.Handlers
-                       Cardano.Wallet.API.Internal.LegacyHandlers
                        Cardano.Wallet.API.Request
                        Cardano.Wallet.API.Request.Filter
                        Cardano.Wallet.API.Request.Pagination
@@ -33,9 +31,6 @@ library
                        Cardano.Wallet.API.Response.Sort.IxSet
                        Cardano.Wallet.API.Types
                        Cardano.Wallet.API.Types.UnitOfMeasure
-                       Cardano.Wallet.API.V0
-                       Cardano.Wallet.API.V0.Handlers
-                       Cardano.Wallet.API.V0.Types
                        Cardano.Wallet.API.V1
                        Cardano.Wallet.API.V1.Accounts
                        Cardano.Wallet.API.V1.Addresses
@@ -50,14 +45,6 @@ library
                        Cardano.Wallet.API.V1.Handlers.Wallets
                        Cardano.Wallet.API.V1.Headers
                        Cardano.Wallet.API.V1.Info
-                       Cardano.Wallet.API.V1.LegacyHandlers
-                       Cardano.Wallet.API.V1.LegacyHandlers.Accounts
-                       Cardano.Wallet.API.V1.LegacyHandlers.Addresses
-                       Cardano.Wallet.API.V1.LegacyHandlers.Info
-                       Cardano.Wallet.API.V1.LegacyHandlers.Instances
-                       Cardano.Wallet.API.V1.LegacyHandlers.Settings
-                       Cardano.Wallet.API.V1.LegacyHandlers.Transactions
-                       Cardano.Wallet.API.V1.LegacyHandlers.Wallets
                        Cardano.Wallet.API.V1.Migration
                        Cardano.Wallet.API.V1.Migration.Monads
                        Cardano.Wallet.API.V1.Migration.Types
@@ -132,7 +119,6 @@ library
                        Cardano.Wallet.Kernel.Util.StrictNonEmpty
                        Cardano.Wallet.Kernel.Util.StrictStateT
                        Cardano.Wallet.Kernel.Wallets
-                       Cardano.Wallet.LegacyServer
                        Cardano.Wallet.Orphans
                        Cardano.Wallet.Orphans.Aeson
                        Cardano.Wallet.Orphans.Arbitrary
@@ -142,7 +128,6 @@ library
                        Cardano.Wallet.Server.Middlewares
                        Cardano.Wallet.Server.Plugins
                        Cardano.Wallet.Server.Plugins.AcidState
-                       Cardano.Wallet.Server.LegacyPlugins
                        Cardano.Wallet.TypeLits
                        Cardano.Wallet.Types.UtxoStatistics
                        Cardano.Wallet.Client
@@ -561,11 +546,9 @@ test-suite wallet-new-specs
   hs-source-dirs:   test test/unit
 
   other-modules:    APISpec
-                    InternalAPISpec
                     MarshallingSpec
                     SwaggerSpec
                     RequestSpec
-                    WalletHandlersSpec
                     WalletNewJson
                     Cardano.Wallet.WalletLayer.QuickCheck
 

wallet-new/generate-swagger-file/Main.hs

@@ -6,9 +6,8 @@ import           Universum
 
 import           Data.Swagger (Swagger)
 import           Options.Applicative
-import           Servant ((:<|>))
 
-import           Cardano.Wallet.API (InternalAPI, V1API, v0API)
+import           Cardano.Wallet.API (walletDocAPI)
 import           Pos.Chain.Update (ApplicationName (..), SoftwareVersion (..))
 import           Pos.Util.CompileInfo (CompileTimeInfo (CompileTimeInfo),
                      gitRev)
@@ -26,7 +25,6 @@ data Command = Command
 
 data TargetAPI
     = TargetWalletV1
-    | TargetWalletV0
     deriving (Show)
 
 
@@ -48,14 +46,13 @@ main =
         cmdParser :: Parser Command
         cmdParser = Command
             <$> targetAPIOption (short 't' <> long "target" <> metavar "API"
-                  <> help "Target API with version (e.g. 'wallet@v1', 'wallet@v0')")
+                  <> help "Target API with version (e.g. 'wallet@v1')")
 
             <*> optional (strOption (short 'o' <> long "output-file" <> metavar "FILEPATH"
                     <> help ("Output file, default to: " <> defaultOutputFilename)))
 
         targetAPIOption :: Mod OptionFields TargetAPI -> Parser TargetAPI
         targetAPIOption = option $ maybeReader $ \case
-            "wallet@v0"  -> Just TargetWalletV0
             "wallet@v1"  -> Just TargetWalletV1
             _            -> Nothing
     in do
@@ -69,12 +66,8 @@ main =
 
 mkSwagger :: (CompileTimeInfo, SoftwareVersion) -> TargetAPI -> Swagger
 mkSwagger details = \case
-    TargetWalletV0 ->
-        Swagger.api details v0API  Swagger.highLevelShortDescription
     TargetWalletV1  ->
-        Swagger.api details v1API' Swagger.highLevelDescription
-  where
-    v1API' = Proxy :: Proxy (V1API :<|> InternalAPI)
+        Swagger.api details walletDocAPI Swagger.highLevelDescription
 
 
 -- NOTE The software version is hard-coded here. Do determine the SoftwareVersion,

wallet-new/generate-swagger-file/README.md

@@ -11,13 +11,13 @@ $ cardano-generate-swagger-file --help
 Usage: cardano-generate-swagger-file (-t|--target API) [-o|--output-file FILEPATH]
 
 Available options:
-  -t,--target API           Target API with version (e.g. 'wallet@v1', 'wallet@v0', 'wallet@dev'...)
+  -t,--target API           Target API with version (e.g. 'wallet@v1'...)
   -o,--output-file FILEPATH Output file, default to: swagger.json
   -h,--help                 Show this help text
 
 Examples:
   cardano-generate-swagger-file --target wallet@v1
-  cardano-generate-swagger-file -t wallet@dev -o dev.json
+  cardano-generate-swagger-file -t wallet@v1 -o v1.json
 ```
 
 

wallet-new/server/Main.hs

@@ -7,7 +7,6 @@ import           Pos.Launcher (launchNode)
 import           Pos.Util.CompileInfo (withCompileInfo)
 
 import           Cardano.Wallet.Action (actionWithWallet)
-import qualified Cardano.Wallet.LegacyAction as Legacy
 import           Cardano.Wallet.Server.CLI (ChooseWalletBackend (..),
                      WalletStartupOptions (..), getWalletNodeOptions)
 
@@ -22,8 +21,8 @@ main = withCompileInfo $ do
     putText "Wallet is starting..."
 
     launchNode nArgs cArgs lArgs $ case wArgs of
-        WalletLegacy p ->
-            Legacy.actionWithWallet p
+        WalletLegacy _ ->
+            error "Legacy wallet is now disabled. This option will be removed soon."
 
         WalletNew p ->
             actionWithWallet p

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

@@ -1,20 +1,18 @@
 module Cardano.Wallet.API
-       ( V0API
-       , V0API'
-       , v0API
+       ( -- * Wallet API Top-Level Representations
+         WalletAPI
+       , walletAPI
+       , WalletDoc
+       , walletDoc
+       , walletDocAPI
+
+         -- * Components Representations
        , V1API
        , v1API
        , InternalAPI
        , internalAPI
-       , WalletAPI
-       , walletAPI
-       , WalletDocAPI
-       , walletDocAPI
        , WIPAPI
-       , NewWalletDocAPI
-       , newWalletDocAPI
-       , NewWalletAPI
-       , newWalletAPI
+       , wipAPI
        ) where
 
 import           Cardano.Wallet.API.Types (WalletLoggingConfig)
@@ -23,34 +21,36 @@ import           Servant ((:<|>), (:>), Proxy (..))
 import           Servant.Swagger.UI (SwaggerSchemaUI)
 
 import qualified Cardano.Wallet.API.Internal as Internal
-import qualified Cardano.Wallet.API.V0 as V0
 import qualified Cardano.Wallet.API.V1 as V1
 import qualified Cardano.Wallet.API.WIP as WIP
 
--- | The complete API, qualified by its versions. For backward compatibility's sake, we still expose
--- the old API under @/api/@. Specification is split under separate modules.
+-- | The complete API, qualified by its versions. For backward compatibility's
+-- sake, we still expose the old API under @/api/@. Specification is split under
+-- separate modules.
+--
 -- Unsurprisingly:
 --
--- * 'Cardano.Wallet.API.V0' hosts the full specification of the V0 (Legacy) API;
 -- * 'Cardano.Wallet.API.V1' hosts the full specification of the V1 API;
 --
--- This project uses Servant, which means the logic is separated from the implementation (i.e. the Server).
--- Such server, together with all its web handlers lives in an executable which contains the aptly-named
--- modules:
+-- This project uses Servant, which means the logic is separated from the
+-- implementation (i.e. the Server). Such server, together with all its web
+-- handlers lives in an executable which contains the aptly-named modules:
 --
 -- * 'Cardano.Wallet.Server' contains the main server;
--- * 'Cardano.Wallet.API.V0.Handlers' contains all the @Handler@s serving the V0 API;
 -- * 'Cardano.Wallet.API.V1.Handlers' contains all the @Handler@s serving the V1 API;
--- * 'Cardano.Wallet.API.Internalelopment.Handlers' contains all the @Handler@s serving the Internal API;
+-- * 'Cardano.Wallet.API.Internal.Handlers' contains all the @Handler@s serving the Internal API;
+-- * 'Cardano.Wallet.API.WIP.Handlers' contains @Handler@s still being worked on;
 
-type V0Doc = "docs" :> "v0" :> SwaggerSchemaUI "index" "swagger.json"
-type V1Doc = "docs" :> "v1" :> SwaggerSchemaUI "index" "swagger.json"
+type WalletAPI = LoggingApi WalletLoggingConfig (V1API :<|> InternalAPI :<|> WIPAPI)
+walletAPI :: Proxy WalletAPI
+walletAPI = Proxy
 
+type WalletDoc = "docs" :> "v1" :> SwaggerSchemaUI "index" "swagger.json"
+walletDoc :: Proxy WalletDoc
+walletDoc = Proxy
+walletDocAPI :: Proxy (V1API :<|> InternalAPI)
+walletDocAPI = Proxy
 
-type V0API  = "api" :> V0.API
-type V0API' = "api" :> "v0" :> V0.API
-v0API :: Proxy V0API
-v0API = Proxy
 
 type V1API = "api" :> "v1" :> V1.API
 v1API :: Proxy V1API
@@ -61,19 +61,5 @@ internalAPI :: Proxy InternalAPI
 internalAPI = Proxy
 
 type WIPAPI = "api" :> "unimplemented" :> WIP.API
-
-type WalletAPI = LoggingApi WalletLoggingConfig (V0API' :<|> V0API :<|> V1API :<|> InternalAPI :<|> WIPAPI)
-walletAPI :: Proxy WalletAPI
-walletAPI = Proxy
-
-type WalletDocAPI = V0Doc :<|> V1Doc
-walletDocAPI :: Proxy WalletDocAPI
-walletDocAPI = Proxy
-
-type NewWalletAPI = LoggingApi WalletLoggingConfig (V1API :<|> InternalAPI :<|> WIPAPI)
-newWalletAPI :: Proxy NewWalletAPI
-newWalletAPI = Proxy
-
-type NewWalletDocAPI = V1Doc
-newWalletDocAPI :: Proxy NewWalletDocAPI
-newWalletDocAPI = Proxy
+wipAPI :: Proxy WIPAPI
+wipAPI = Proxy