Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit f9250d0

Browse files
authored
Merge pull request #3750 from input-output-hk/anviking/CO-428/rm-cardano-sl-wallet
[CO-430] Cleanup cardano-sl references to `cardano-sl-wallet`
2 parents 6adadde + 49b1e6e commit f9250d0

File tree

9 files changed

+4
-20
lines changed

9 files changed

+4
-20
lines changed

appveyor.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ before_test:
8080
# 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.
8181
- copy rocksdb.dll node
8282
- copy rocksdb.dll lib
83-
- copy rocksdb.dll wallet
8483
- copy rocksdb.dll wallet-new
8584

8685
# Install liblzma/xz
@@ -108,14 +107,13 @@ test_script:
108107
# - 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
109108
# Retry transient failures due to https://github.com/haskell/cabal/issues/4005
110109
# We intentionally don't build auxx here, because this build is for installer.
111-
- scripts\ci\appveyor-retry call stack --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet cardano-sl-wallet-new
110+
- scripts\ci\appveyor-retry call stack --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet-new
112111
-j 3
113112
--no-terminal
114113
--local-bin-path %WORK_DIR%
115114
--no-haddock-deps
116115
--flag cardano-sl-core:-asserts
117116
--flag cardano-sl-tools:for-installer
118-
--flag cardano-sl-wallet:for-installer
119117
--extra-include-dirs="C:\OpenSSL-Win64-v102\include"
120118
--extra-lib-dirs="C:\OpenSSL-Win64-v102"
121119
--extra-include-dirs="C:\xz_extracted\include"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ NOTE: the various other Cardano components can be obtained through other attribu
7979
- `cardano-explorer`, `cardano-explorer-swagger`, `cardano-explorer-mock`
8080
- `cardano-sl-tools`:
8181
- `cardano-analyzer`, `cardano-dht-keygen`, `cardano-genupdate`, `cardano-keygen`, `cardano-launcher`, `cardano-addr-convert`, `cardano-cli-docs`, `cardano-block-gen`, `cardano-post-mortem`
82-
- `cardano-sl-wallet-static`:
82+
- `cardano-sl-wallet-new-static`:
8383
- `cardano-node`, `cardano-swagger`
8484

8585
In general, for any given cabal `PACKAGE` provided by Cardano, there is a

faucet/cardano-sl-faucet.cabal

-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ library
2626
, cardano-sl-crypto
2727
, cardano-sl-chain
2828
, cardano-sl-util
29-
, cardano-sl-wallet
3029
, cardano-sl-wallet-new
3130
, connection
3231
, cryptonite
@@ -95,7 +94,6 @@ executable cardano-faucet
9594
, cardano-sl-infra
9695
, cardano-sl-chain
9796
, cardano-sl-util
98-
, cardano-sl-wallet
9997
, cardano-sl-wallet-new
10098
, ekg
10199
, ekg-core
@@ -132,7 +130,6 @@ test-suite faucet-test
132130
, bytestring
133131
, cardano-sl-core
134132
, cardano-sl-faucet
135-
, cardano-sl-wallet
136133
, cardano-sl-wallet-new
137134
, hspec
138135
, mtl

nix/overlays/required.nix

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ self: super: {
3131
inherit enableProfiling;
3232
};
3333
});
34-
cardano-sl-wallet-static = justStaticExecutablesGitRev super.cardano-sl-wallet;
3534
cardano-sl-client = addRealTimeTestLogs super.cardano-sl-client;
3635
cardano-sl-generator = addRealTimeTestLogs super.cardano-sl-generator;
3736
cardano-sl-networking = addRealTimeTestLogs super.cardano-sl-networking;

pkgs/default.nix

-6
Original file line numberDiff line numberDiff line change
@@ -16428,7 +16428,6 @@ license = stdenv.lib.licenses.mit;
1642816428
, cardano-sl-crypto
1642916429
, cardano-sl-infra
1643016430
, cardano-sl-util
16431-
, cardano-sl-wallet
1643216431
, cardano-sl-wallet-new
1643316432
, connection
1643416433
, cryptonite
@@ -16494,7 +16493,6 @@ cardano-sl-chain
1649416493
cardano-sl-core
1649516494
cardano-sl-crypto
1649616495
cardano-sl-util
16497-
cardano-sl-wallet
1649816496
cardano-sl-wallet-new
1649916497
connection
1650016498
cryptonite
@@ -16544,7 +16542,6 @@ cardano-sl-chain
1654416542
cardano-sl-core
1654516543
cardano-sl-infra
1654616544
cardano-sl-util
16547-
cardano-sl-wallet
1654816545
cardano-sl-wallet-new
1654916546
ekg
1655016547
ekg-core
@@ -16571,7 +16568,6 @@ aeson
1657116568
base
1657216569
bytestring
1657316570
cardano-sl-core
16574-
cardano-sl-wallet
1657516571
cardano-sl-wallet-new
1657616572
hspec
1657716573
mtl
@@ -17274,7 +17270,6 @@ license = stdenv.lib.licenses.mit;
1727417270
, cardano-sl-networking
1727517271
, cardano-sl-util
1727617272
, cardano-sl-util-test
17277-
, cardano-sl-wallet
1727817273
, cardano-sl-x509
1727917274
, containers
1728017275
, cpphs
@@ -17344,7 +17339,6 @@ cardano-sl-db
1734417339
cardano-sl-infra
1734517340
cardano-sl-networking
1734617341
cardano-sl-util
17347-
cardano-sl-wallet
1734817342
containers
1734917343
data-default
1735017344
directory

release.nix

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ let
5656
cardano-sl-tools = supportedSystems;
5757
cardano-sl-tools-post-mortem = supportedSystems;
5858
cardano-sl-util = supportedSystems;
59-
cardano-sl-wallet = supportedSystems;
6059
cardano-sl-wallet-new = supportedSystems;
6160
cardano-sl-x509 = supportedSystems;
6261
daedalus-bridge = supportedSystems;

scripts/bench/buildbench.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22

3-
stack build --flag cardano-sl-core:-asserts cardano-sl cardano-sl-auxx cardano-sl-wallet cardano-sl-explorer cardano-sl-tools
3+
stack build --flag cardano-sl-core:-asserts cardano-sl cardano-sl-auxx cardano-sl-explorer cardano-sl-tools

scripts/build/cardano-sl.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ set -o pipefail
4141
# * Pass --bench-mode to use the configuration used by modern benchmarks.
4242

4343
# Note: this list should be topologically sorted.
44-
projects="networking binary util crypto core db chain infra lib node client generator auxx tools explorer wallet wallet-new"
44+
projects="networking binary util crypto core db chain infra lib node client generator auxx tools explorer wallet-new"
4545

4646
# Returns name of a stack project to build, given the alias.
4747
function pkgNameToProject {
@@ -199,8 +199,6 @@ if [[ "$spec_prj" == "" ]]; then
199199
pkgName=$(pkgNameToProject "$prj")
200200
to_build="$to_build $pkgName"
201201
done
202-
elif [[ "$spec_prj" == "wallet" ]]; then
203-
to_build="cardano-sl-node cardano-sl-wallet"
204202
elif [[ "$spec_prj" == "wallet-new" ]]; then
205203
to_build="cardano-sl-node cardano-sl-wallet-new"
206204
elif [[ "$spec_prj" == "explorer" ]]; then

tools/cardano-sl-tools.cabal

-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ library
376376
, cardano-sl-infra
377377
, cardano-sl-networking
378378
, cardano-sl-util
379-
, cardano-sl-wallet
380379
, containers
381380
, data-default
382381
, directory

0 commit comments

Comments
 (0)