Merge branch 'CO-430' into CO-372/TheGreatCleanup

Author: KtorZ

appveyor.yml

@@ -80,7 +80,6 @@ before_test:
 # After some investigation, it was discovered that this was because 'rocksdb.dll' has to be located in this folder as well, or else the test executable doesn't work.
 - copy rocksdb.dll node
 - copy rocksdb.dll lib
-- copy rocksdb.dll wallet
 - copy rocksdb.dll wallet-new
 
 # Install liblzma/xz
@@ -108,14 +107,13 @@ test_script:
 #   - stack hpc report cardano-sl cardano-sl-txp cardano-sl-core cardano-sl-db cardano-sl-update cardano-sl-infra cardano-sl-lrc cardano-sl-ssc
 # Retry transient failures due to https://github.com/haskell/cabal/issues/4005
   # We intentionally don't build auxx here, because this build is for installer.
-  - scripts\ci\appveyor-retry call stack --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet cardano-sl-wallet-new
+  - scripts\ci\appveyor-retry call stack --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet-new
       -j 3
       --no-terminal
       --local-bin-path %WORK_DIR%
       --no-haddock-deps
       --flag cardano-sl-core:-asserts
       --flag cardano-sl-tools:for-installer
-      --flag cardano-sl-wallet:for-installer
       --extra-include-dirs="C:\OpenSSL-Win64-v102\include"
       --extra-lib-dirs="C:\OpenSSL-Win64-v102"
       --extra-include-dirs="C:\xz_extracted\include"

docs/how-to/build-cardano-sl-and-daedalus-from-source-code.md

@@ -65,7 +65,7 @@ NOTE: the various other Cardano components can be obtained through other attribu
    - `cardano-explorer`, `cardano-explorer-swagger`, `cardano-explorer-mock`
 -  `cardano-sl-tools`:
    - `cardano-analyzer`, `cardano-dht-keygen`, `cardano-genupdate`, `cardano-keygen`, `cardano-launcher`, `cardano-addr-convert`, `cardano-cli-docs`, `cardano-block-gen`, `cardano-post-mortem`
--  `cardano-sl-wallet-static`:
+-  `cardano-sl-wallet-new-static`:
    - `cardano-node`, `cardano-swagger`
 
 In general, for any given cabal `PACKAGE` provided by Cardano, there is a

faucet/cardano-sl-faucet.cabal

@@ -26,7 +26,6 @@ library
                     , cardano-sl-crypto
                     , cardano-sl-chain
                     , cardano-sl-util
-                    , cardano-sl-wallet
                     , cardano-sl-wallet-new
                     , connection
                     , cryptonite
@@ -95,7 +94,6 @@ executable cardano-faucet
                    , cardano-sl-infra
                    , cardano-sl-chain
                    , cardano-sl-util
-                   , cardano-sl-wallet
                    , cardano-sl-wallet-new
                    , ekg
                    , ekg-core
@@ -132,7 +130,6 @@ test-suite faucet-test
                    , bytestring
                    , cardano-sl-core
                    , cardano-sl-faucet
-                   , cardano-sl-wallet
                    , cardano-sl-wallet-new
                    , hspec
                    , mtl

pkgs/default.nix

@@ -16538,7 +16538,6 @@ license = stdenv.lib.licenses.mit;
 , cardano-sl-crypto
 , cardano-sl-infra
 , cardano-sl-util
-, cardano-sl-wallet
 , cardano-sl-wallet-new
 , connection
 , cryptonite
@@ -16604,7 +16603,6 @@ cardano-sl-chain
 cardano-sl-core
 cardano-sl-crypto
 cardano-sl-util
-cardano-sl-wallet
 cardano-sl-wallet-new
 connection
 cryptonite
@@ -16654,7 +16652,6 @@ cardano-sl-chain
 cardano-sl-core
 cardano-sl-infra
 cardano-sl-util
-cardano-sl-wallet
 cardano-sl-wallet-new
 ekg
 ekg-core
@@ -16681,7 +16678,6 @@ aeson
 base
 bytestring
 cardano-sl-core
-cardano-sl-wallet
 cardano-sl-wallet-new
 hspec
 mtl
@@ -17384,7 +17380,6 @@ license = stdenv.lib.licenses.mit;
 , cardano-sl-networking
 , cardano-sl-util
 , cardano-sl-util-test
-, cardano-sl-wallet
 , cardano-sl-x509
 , containers
 , cpphs
@@ -17455,7 +17450,6 @@ cardano-sl-db
 cardano-sl-infra
 cardano-sl-networking
 cardano-sl-util
-cardano-sl-wallet
 containers
 data-default
 directory

release.nix

@@ -60,7 +60,6 @@ let
     cardano-sl-tools = supportedSystems;
     cardano-sl-tools-post-mortem = supportedSystems;
     cardano-sl-util = supportedSystems;
-    cardano-sl-wallet = supportedSystems;
     cardano-sl-wallet-new = supportedSystems;
     cardano-sl-x509 = supportedSystems;
     daedalus-bridge = supportedSystems;

scripts/bench/buildbench.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-stack build --flag cardano-sl-core:-asserts cardano-sl cardano-sl-auxx cardano-sl-wallet cardano-sl-explorer cardano-sl-tools
+stack build --flag cardano-sl-core:-asserts cardano-sl cardano-sl-auxx cardano-sl-explorer cardano-sl-tools

scripts/build/cardano-sl.sh

@@ -41,7 +41,7 @@ set -o pipefail
 # * Pass --bench-mode to use the configuration used by modern benchmarks.
 
 # Note: this list should be topologically sorted.
-projects="networking binary util crypto core db chain infra lib node client generator auxx tools explorer wallet wallet-new"
+projects="networking binary util crypto core db chain infra lib node client generator auxx tools explorer wallet-new"
 
 # Returns name of a stack project to build, given the alias.
 function pkgNameToProject {
@@ -199,8 +199,6 @@ if [[ "$spec_prj" == "" ]]; then
     pkgName=$(pkgNameToProject "$prj")
     to_build="$to_build $pkgName"
   done
-elif [[ "$spec_prj" == "wallet" ]]; then
-  to_build="cardano-sl-node cardano-sl-wallet"
 elif [[ "$spec_prj" == "wallet-new" ]]; then
   to_build="cardano-sl-node cardano-sl-wallet-new"
 elif [[ "$spec_prj" == "explorer" ]]; then

tools/cardano-sl-tools.cabal

@@ -376,7 +376,6 @@ library
                      , cardano-sl-infra
                      , cardano-sl-networking
                      , cardano-sl-util
-                     , cardano-sl-wallet
                      , containers
                      , data-default
                      , directory