Rename cardano-wallet-shelley to just cardano-wallet

.travis.yml

@@ -54,26 +54,26 @@ jobs:
     ############################
 
     # Fetch the linux archive
-    - travis_retry curl -L https://hydra.iohk.io/job/Cardano/cardano-wallet/cardano-wallet-shelley-linux64/latest/download/1 | tar xz
-    - find . -maxdepth 1 -type d -name "cardano-wallet-shelley-*" -exec mv \{} cardano-wallet-shelley-linux64 \;
-    - mv cardano-wallet-shelley-linux64/cardano-wallet-shelley cardano-wallet-shelley-linux64/cardano-wallet
-    - tar czf cardano-wallet-$TRAVIS_TAG-linux64.tar.gz cardano-wallet-shelley-linux64
-    - rm -rf cardano-wallet-shelley-linux64
+    - travis_retry curl -L https://hydra.iohk.io/job/Cardano/cardano-wallet/cardano-wallet-linux64/latest/download/1 | tar xz
+    - find . -maxdepth 1 -type d -name "cardano-wallet-*" -exec mv \{} cardano-wallet-linux64 \;
+    - mv cardano-wallet-linux64/cardano-wallet cardano-wallet-linux64/cardano-wallet
+    - tar czf cardano-wallet-$TRAVIS_TAG-linux64.tar.gz cardano-wallet-linux64
+    - rm -rf cardano-wallet-linux64
 
     # Fetch the MacOS archive
-    - travis_retry curl -L https://hydra.iohk.io/job/Cardano/cardano-wallet/cardano-wallet-shelley-macos64/latest/download/1 | tar xz
-    - find . -maxdepth 1 -type d -name "cardano-wallet-shelley-*" -exec mv \{} cardano-wallet-shelley-macos64 \;
-    - mv cardano-wallet-shelley-macos64/cardano-wallet-shelley cardano-wallet-shelley-macos64/cardano-wallet
-    - tar czf cardano-wallet-$TRAVIS_TAG-macos64.tar.gz cardano-wallet-shelley-macos64
-    - rm -rf cardano-wallet-shelley-macos64
+    - travis_retry curl -L https://hydra.iohk.io/job/Cardano/cardano-wallet/cardano-wallet-macos64/latest/download/1 | tar xz
+    - find . -maxdepth 1 -type d -name "cardano-wallet-*" -exec mv \{} cardano-wallet-macos64 \;
+    - mv cardano-wallet-macos64/cardano-wallet cardano-wallet-macos64/cardano-wallet
+    - tar czf cardano-wallet-$TRAVIS_TAG-macos64.tar.gz cardano-wallet-macos64
+    - rm -rf cardano-wallet-macos64
 
     # Fetch the Windows archive
-    - travis_retry curl -L https://hydra.iohk.io/job/Cardano/cardano-wallet/cardano-wallet-shelley-win64/latest/download/1 --output cardano-wallet-shelley-win64.zip
-    - unzip -d cardano-wallet-shelley-win64 cardano-wallet-shelley-win64.zip
-    - mv cardano-wallet-shelley-win64/cardano-wallet-shelley.exe cardano-wallet-shelley-win64/cardano-wallet.exe
-    - zip -r cardano-wallet-$TRAVIS_TAG-win64.zip cardano-wallet-shelley-win64
-    - rm -rf cardano-wallet-shelley-win64
-    - rm cardano-wallet-shelley-win64.zip
+    - travis_retry curl -L https://hydra.iohk.io/job/Cardano/cardano-wallet/cardano-wallet-win64/latest/download/1 --output cardano-wallet-win64.zip
+    - unzip -d cardano-wallet-win64 cardano-wallet-win64.zip
+    - mv cardano-wallet-win64/cardano-wallet.exe cardano-wallet-win64/cardano-wallet.exe
+    - zip -r cardano-wallet-$TRAVIS_TAG-win64.zip cardano-wallet-win64
+    - rm -rf cardano-wallet-win64
+    - rm cardano-wallet-win64.zip
 
     ############################
     # jörmungandr

.weeder.yaml

@@ -1,5 +1,5 @@
 - package:
-  - name: cardano-wallet-shelley
+  - name: cardano-wallet
   - section:
     - name: bench:restore
     - message:

default.nix

@@ -8,7 +8,7 @@
 # Interesting top-level attributes:
 #
 #   - cardano-wallet-jormungandr - cli executable
-#   - cardano-wallet-shelley - cli executable
+#   - cardano-wallet - cli executable
 #   - tests - attrset of test-suite executables
 #     - cardano-wallet-core.unit
 #     - cardano-wallet-jormungandr.jormungandr-integration
@@ -93,10 +93,10 @@ let
       haskellBuildUtils = haskellBuildUtils.package;
     };
 
-    cardano-wallet-shelley = import ./nix/package-cardano-node.nix {
+    cardano-wallet = import ./nix/package-cardano-node.nix {
       inherit pkgs gitrev;
       haskellBuildUtils = haskellBuildUtils.package;
-      exe = haskellPackages.cardano-wallet-shelley.components.exes.cardano-wallet-shelley;
+      exe = haskellPackages.cardano-wallet.components.exes.cardano-wallet;
       inherit (self) cardano-node;
     };
 
@@ -111,7 +111,7 @@ let
       mkDockerImage = backend: exe: pkgs.callPackage ./nix/docker.nix { inherit backend exe; };
     in recurseIntoAttrs (mapAttrs mkDockerImage {
       jormungandr = self.cardano-wallet-jormungandr;
-      shelley = self.cardano-wallet-shelley;
+      shelley = self.cardano-wallet;
     });
 
     shell = haskellPackages.shellFor {

docker-compose.yml

@@ -32,7 +32,7 @@ services:
         ($$CMD --testnet /config/*-$$NETWORK-byron-genesis.json)
       "
     environment:
-      CMD: "cardano-wallet-shelley serve --node-socket /ipc/node.socket --database /wallet-db --listen-address 0.0.0.0"
+      CMD: "cardano-wallet serve --node-socket /ipc/node.socket --database /wallet-db --listen-address 0.0.0.0"
       NETWORK:
     restart: on-failure
     logging:

lib/shelley/bench/Restore.hs

@@ -15,7 +15,7 @@
 -- Easiest run using
 -- @
 --     $ export NODE_DB="node-db-testnet"
---     $ nix-build -A benchmarks.cardano-wallet-shelley.restore -o restore && ./restore/bin/restore testnet
+--     $ nix-build -A benchmarks.cardano-wallet.restore -o restore && ./restore/bin/restore testnet
 -- @
 --
 -- or

lib/shelley/cardano-wallet-shelley.cabal → lib/shelley/cardano-wallet.cabal

@@ -1,4 +1,4 @@
-name:                cardano-wallet-shelley
+name:                cardano-wallet
 version:             2020.8.3
 synopsis:            Wallet backend protocol-specific bits implemented using Shelley nodes
 description:         Please see README.md
@@ -98,7 +98,7 @@ library
       Cardano.Wallet.Shelley.Launch
       Cardano.Wallet.Shelley.Pools
 
-executable cardano-wallet-shelley
+executable cardano-wallet
   default-language:
       Haskell2010
   default-extensions:
@@ -114,7 +114,7 @@ executable cardano-wallet-shelley
     , cardano-wallet-cli
     , cardano-wallet-core
     , cardano-wallet-launcher
-    , cardano-wallet-shelley
+    , cardano-wallet
     , contra-tracer
     , iohk-monitoring
     , network
@@ -126,7 +126,7 @@ executable cardano-wallet-shelley
   hs-source-dirs:
       exe
   main-is:
-    cardano-wallet-shelley.hs
+    cardano-wallet.hs
 
 test-suite unit
   default-language:
@@ -150,7 +150,7 @@ test-suite unit
     , cardano-api
     , cardano-crypto-class
     , cardano-wallet-core
-    , cardano-wallet-shelley
+    , cardano-wallet
     , containers
     , contra-tracer
     , iohk-monitoring
@@ -196,7 +196,7 @@ test-suite integration
     , cardano-wallet-core
     , cardano-wallet-core-integration
     , cardano-wallet-launcher
-    , cardano-wallet-shelley
+    , cardano-wallet
     , cardano-wallet-test-utils
     , contra-tracer
     , hspec
@@ -205,7 +205,7 @@ test-suite integration
     , text
     , text-class
   build-tools:
-      cardano-wallet-shelley
+      cardano-wallet
   type:
      exitcode-stdio-1.0
   hs-source-dirs:
@@ -232,7 +232,7 @@ benchmark restore
     , cardano-addresses
     , cardano-wallet-core
     , cardano-wallet-core-integration
-    , cardano-wallet-shelley
+    , cardano-wallet
     , contra-tracer
     , containers
     , cryptonite
@@ -276,7 +276,7 @@ benchmark latency
    , cardano-wallet-cli
    , cardano-wallet-core
    , cardano-wallet-core-integration
-   , cardano-wallet-shelley
+   , cardano-wallet
    , cardano-wallet-launcher
    , directory
    , filepath

lib/shelley/src/Cardano/Wallet/Shelley.hs

@@ -221,7 +221,7 @@ instance HasNetworkId ('Staging protocolMagic) where
 
 deriving instance Show SomeNetworkDiscriminant
 
--- | The @cardano-wallet-shelley@ main function. It takes the configuration
+-- | The @cardano-wallet@ main function. It takes the configuration
 -- which was passed from the CLI and environment and starts all components of
 -- the wallet.
 serveWallet

lib/shelley/test/integration/Main.hs

@@ -133,7 +133,7 @@ import qualified Test.Integration.Scenario.CLI.Shelley.Wallets as WalletsCLI
 
 -- | Define the actual executable name for the bridge CLI
 instance KnownCommand Shelley where
-    commandName = "cardano-wallet-shelley"
+    commandName = "cardano-wallet"
 
 main :: forall t n . (t ~ Shelley, n ~ 'Mainnet) => IO ()
 main = withUtf8Encoding $ withTracers $ \tracers -> do

nix/Dockerfile

@@ -1,6 +1,6 @@
 ############################################################################
 #
-# Super-minimal Docker image for cardano-wallet-shelley -- everything
+# Super-minimal Docker image for cardano-wallet -- everything
 # except the nixpkgs base is built from source.
 #
 # Make sure you have plenty of time and disk space for this.
@@ -42,7 +42,7 @@ RUN test -n "${USE_IOHK_CACHE}" && ( echo "Note: using IOHK nix cache" > /dev/st
 
 # Make a docker layer with a warm cache (helps re-use compilers for
 # subsequent builds).
-RUN nix-build https://github.com/input-output-hk/cardano-wallet/archive/master.tar.gz -A cardano-wallet-shelley --no-out-link
+RUN nix-build https://github.com/input-output-hk/cardano-wallet/archive/master.tar.gz -A cardano-wallet --no-out-link
 
 
 ############################################################################
@@ -61,7 +61,7 @@ WORKDIR cardano-wallet
 # Build
 
 # Build the wallet and node static binaries package, untar to "out" directory
-RUN tar -xzvf $(nix-build release.nix -A cardano-wallet-shelley-linux64 --no-out-link)/*.tar.gz
+RUN tar -xzvf $(nix-build release.nix -A cardano-wallet-linux64 --no-out-link)/*.tar.gz
 RUN mv cardano-wallet-* ../out
 
 # TODO: Alternatively, we could build the dockerImage.shelley
@@ -75,6 +75,6 @@ FROM scratch
 CMD mkdir -p bin
 # It is ok to COPY files from a build container (when using multi-stage builds)
 COPY --from=builder out/cardano-node bin/cardano-node
-COPY --from=builder out/cardano-wallet-shelley bin/cardano-wallet-shelley
-ENTRYPOINT ["cardano-wallet-shelley"]
+COPY --from=builder out/cardano-wallet bin/cardano-wallet
+ENTRYPOINT ["cardano-wallet"]
 CMD []

nix/default.nix

@@ -6,7 +6,7 @@
 # Lets you override niv dependencies of the project without
 # modifications to the source.
 # eg. to test build against a local checkout of cardano-node:
-#   nix-build default.nix -A cardano-wallet-shelley --arg sourcesOverride '{ cardano-node = ../cardano-node; }'
+#   nix-build default.nix -A cardano-wallet --arg sourcesOverride '{ cardano-node = ../cardano-node; }'
 , sourcesOverride ? {}
 }:
 let

nix/docker.nix

@@ -4,7 +4,7 @@
 # To test it out, use:
 #
 #   docker load -i $(nix-build -A dockerImage --no-out-link)
-#   docker run cardano-wallet-shelley
+#   docker run cardano-wallet
 #
 ############################################################################