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

[CO-430] Cleanup cardano-sl references to cardano-sl-wallet #3750

Merged
merged 1 commit into from
Oct 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this isn't still needed to compile the wallet on windows :o

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't there tests for that?

- copy rocksdb.dll wallet-new

# Install liblzma/xz
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,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`:
Copy link
Member Author

@Anviking Anviking Oct 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a problem now when cardano-sl-wallet-static is removed.

Is it fine/correct in the context to replace with cardano-sl-wallet-new-static as I've done here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose 😶

- `cardano-node`, `cardano-swagger`

In general, for any given cabal `PACKAGE` provided by Cardano, there is a
Expand Down
3 changes: 0 additions & 3 deletions faucet/cardano-sl-faucet.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ library
, cardano-sl-crypto
, cardano-sl-chain
, cardano-sl-util
, cardano-sl-wallet
, cardano-sl-wallet-new
, connection
, cryptonite
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -132,7 +130,6 @@ test-suite faucet-test
, bytestring
, cardano-sl-core
, cardano-sl-faucet
, cardano-sl-wallet
, cardano-sl-wallet-new
, hspec
, mtl
Expand Down
1 change: 0 additions & 1 deletion nix/overlays/required.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ self: super: {
inherit enableProfiling;
};
});
cardano-sl-wallet-static = justStaticExecutablesGitRev super.cardano-sl-wallet;
cardano-sl-client = addRealTimeTestLogs super.cardano-sl-client;
cardano-sl-generator = addRealTimeTestLogs super.cardano-sl-generator;
cardano-sl-networking = addRealTimeTestLogs super.cardano-sl-networking;
Expand Down
6 changes: 0 additions & 6 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16428,7 +16428,6 @@ license = stdenv.lib.licenses.mit;
, cardano-sl-crypto
, cardano-sl-infra
, cardano-sl-util
, cardano-sl-wallet
, cardano-sl-wallet-new
, connection
, cryptonite
Expand Down Expand Up @@ -16494,7 +16493,6 @@ cardano-sl-chain
cardano-sl-core
cardano-sl-crypto
cardano-sl-util
cardano-sl-wallet
cardano-sl-wallet-new
connection
cryptonite
Expand Down Expand Up @@ -16544,7 +16542,6 @@ cardano-sl-chain
cardano-sl-core
cardano-sl-infra
cardano-sl-util
cardano-sl-wallet
cardano-sl-wallet-new
ekg
ekg-core
Expand All @@ -16571,7 +16568,6 @@ aeson
base
bytestring
cardano-sl-core
cardano-sl-wallet
cardano-sl-wallet-new
hspec
mtl
Expand Down Expand Up @@ -17274,7 +17270,6 @@ license = stdenv.lib.licenses.mit;
, cardano-sl-networking
, cardano-sl-util
, cardano-sl-util-test
, cardano-sl-wallet
, cardano-sl-x509
, containers
, cpphs
Expand Down Expand Up @@ -17344,7 +17339,6 @@ cardano-sl-db
cardano-sl-infra
cardano-sl-networking
cardano-sl-util
cardano-sl-wallet
containers
data-default
directory
Expand Down
1 change: 0 additions & 1 deletion release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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;
Expand Down
2 changes: 1 addition & 1 deletion scripts/bench/buildbench.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions scripts/build/cardano-sl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tools/cardano-sl-tools.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ library
, cardano-sl-infra
, cardano-sl-networking
, cardano-sl-util
, cardano-sl-wallet
, containers
, data-default
, directory
Expand Down