Merge #2313

2313: Fork Jormungandr r=rvl a=rvl ### Jira issue ADP-548 ### Overview We are forking the [cardano-wallet-jormungandr](https://github.com/input-output-hk/cardano-wallet-jormungandr) application into a new GitHub repo. This repo will become cardano-node only. cardano-wallet-jormungandr repo setup: ``` git fetch origin --prune --force --tags git checkout master git reset --hard v2020-11-03 git remote add jormungandr [email protected]:input-output-hk/cardano-wallet-jormungandr.git git push jormungandr master --tags git checkout -b cardano-wallet-jormungandr master git branch --set-upstream-to=jormungandr/master --track ``` ### Comments - [x] Remove cardano-wallet-jormungandr package from this repo. - [x] Update the build scripts to remove jormungandr. - [x] Copy github repository access settings across. ### Future PRs - [ ] Update migration tests to use shelley backend. - [ ] Some jormungandr-specific code and tests could probably be removed. Co-authored-by: Rodney Lorrimar <[email protected]>
cardano-foundation · Nov 17, 2020 · 1fe597e · 1fe597e
2 parents db02ac0 + fb2b1b8
commit 1fe597e
Show file tree

Hide file tree

Showing 239 changed files with 38 additions and 27,125 deletions.
diff --git a/.buildkite/bench-latency.sh b/.buildkite/bench-latency.sh
@@ -7,7 +7,6 @@ cd `dirname $0`/..
 
 echo "--- Build"
 nix-build -A benchmarks.cardano-wallet.latency -o bench-latency-shelley
-nix-build -A benchmarks.cardano-wallet-jormungandr.latency -o bench-latency-jormungandr
 
 # Note: the tracing will not work if program output is piped
 # to another process (e.g. "tee").
@@ -16,7 +15,3 @@ nix-build -A benchmarks.cardano-wallet-jormungandr.latency -o bench-latency-jorm
 echo "+++ Run benchmark - shelley"
 
 ( cd lib/shelley && ../../bench-latency-shelley/bin/latency )
-
-echo "+++ Run benchmark - jormungandr"
-
-( cd lib/jormungandr && ../../bench-latency-jormungandr/bin/latency )
diff --git a/.buildkite/docker-build-push.nix b/.buildkite/docker-build-push.nix
@@ -25,8 +25,6 @@
 #      recent VERSION-shelley tag build.
 #    - "inputoutput/cardano-wallet:shelley" should point to the most
 #      recent VERSION-shelley tag build.
-#    - "inputoutput/cardano-wallet:jormungandr" should point to the most
-#      recent VERSION-jormungandr tag build.
 #
 
 { walletPackages ?  import ../default.nix {}

diff --git a/.buildkite/nightly.yml b/.buildkite/nightly.yml
@@ -39,14 +39,15 @@ steps:
       system: x86_64-linux
       queue: benchmark
 
-  - label: 'Database Migrations Test'
-    commands:
-      - "rm -rf state-migration-test*"
-      - "nix-build nix/migration-tests.nix -o migration-tests"
-      - "./migration-tests/runall.sh"
-    timeout_in_minutes: 60
-    agents:
-      system: x86_64-linux
+  # TODO: ADP-549 Port migrations test to shelley
+  # - label: 'Database Migrations Test'
+  #   commands:
+  #     - "rm -rf state-migration-test*"
+  #     - "nix-build nix/migration-tests.nix -o migration-tests"
+  #     - "./migration-tests/runall.sh"
+  #   timeout_in_minutes: 60
+  #   agents:
+  #     system: x86_64-linux
 
   - wait
 

diff --git a/.buildkite/rebuild.hs b/.buildkite/rebuild.hs
@@ -139,8 +139,7 @@ parseOpts = execParser opts
 buildStep :: DryRun -> Maybe BuildkiteEnv -> Bool -> IO ExitCode
 buildStep dryRun bk nightly = do
     pkgs <- listLocalPackages
-    let pkgsNoJorm =  filter ( /= "cardano-wallet-jormungandr") pkgs
-    let cabalFlags = concatMap (flag "release") pkgsNoJorm
+    let cabalFlags = concatMap (flag "release") pkgs
 
     titled "Build LTS Snapshot"
         (build Standard ["--only-snapshot"]) .&&.
@@ -172,8 +171,8 @@ buildStep dryRun bk nightly = do
             , [ "test" ]
             , fast opt
             , case qaLevel nightly bk of
-                QuickTest -> skip "integration" <> skip "jormungandr-integration"
-                FullTest -> skip "jormungandr-integration"
+                QuickTest -> skip "integration"
+                FullTest -> mempty
                 NightlyTest -> mempty
             , ta (jobs 8)
             , args

diff --git a/.github/RELEASE_TEMPLATE.md b/.github/RELEASE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!-- Short optional summary -->
 
-Compatible with [`jormungandr@{{JORM_TAG}}`](https://github.com/input-output-hk/jormungandr/releases/tag/{{JORM_TAG}}) and [`cardano-node@{{CARDANO_NODE_TAG}}`](https://github.com/input-output-hk/cardano-node/releases/tag/{{CARDANO_NODE_TAG}}).
+Compatible with [`cardano-node@{{CARDANO_NODE_TAG}}`](https://github.com/input-output-hk/cardano-node/releases/tag/{{CARDANO_NODE_TAG}}).
 
 <!-- A CHANGELOG, organized in three sections:
 
@@ -20,11 +20,9 @@ Compatible with [`jormungandr@{{JORM_TAG}}`](https://github.com/input-output-hk/
 
 <!-- A snapshot of the documentation at the time of releasing. -->
 
-Cardano (cardano-node)                                                                                             | ITN (Jörmungandr)
----                                                                                                                | ---
-[API Documentation](https://input-output-hk.github.io/cardano-wallet/api/{{GIT_TAG}})                              | [API Documentation](https://input-output-hk.github.io/cardano-wallet/api/{{GIT_TAG}})
-[CLI Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-command-line-interface/{{WIKI_COMMIT}}) | [CLI Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-command-line-interface-jormungandr/{{WIKI_COMMIT}})
-[Docker Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Docker/{{WIKI_COMMIT}})                     | [Docker Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Docker-jormungandr/{{WIKI_COMMIT}})
+[API Documentation](https://input-output-hk.github.io/cardano-wallet/api/{{GIT_TAG}})
+[CLI Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-command-line-interface/{{WIKI_COMMIT}})
+[Docker Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Docker/{{WIKI_COMMIT}})
 
 ## Installation Instructions
 
@@ -51,22 +49,7 @@ $ docker run --rm inputoutput/cardano-wallet:{{CABAL_VERSION}} version
 
 ### ITN (jormungandr)
 
-1. Install [`jormungandr@{{JORM_TAG}}`](https://github.com/input-output-hk/jormungandr/releases/tag/{{JORM_TAG}}).
-
-2. Download the provided `cardano-wallet-jormungandr` for your platform, and uncompress it in a directory that is on your `$PATH`, e.g. `/usr/local/bin`. Or `%PATH%` on Windows.
-
-3. (optional) Install the bash/zsh auto-completion script according to the [jormungandr cli manual](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-Command-Line-Interface/{{JORM_CLI_WIKI_COMMIT}})
-
-4. Start `cardano-wallet --help` and see available parameters.
-
-#### Docker
-
-Pull from DockerHub and verify the version matches {{CABAL_VERSION}}
-
-```
-$ docker pull inputoutput/cardano-wallet:{{CABAL_VERSION}}-jormungandr
-$ docker run --rm inputoutput/cardano-wallet:{{CABAL_VERSION}}-jormungandr version
-```
+See [cardano-wallet-jormungandr](https://github.com/input-output-hk/cardano-wallet-jormungandr).
 
 ## Signatures
 

diff --git a/.travis.yml b/.travis.yml
@@ -54,10 +54,6 @@ jobs:
     - npm install --no-save [email protected] [email protected]
     - node --tls-min-v1.2 scripts/travis-download-builds.js
 
-    ############################
-    # cardano-node
-    ############################
-
     # Unpack and rename stuff for the Linux archive
     - "tar xzf cardano-wallet-20*-linux64.tar.gz"
     - "mv cardano-wallet-20*/ cardano-wallet-linux64"
@@ -82,36 +78,6 @@ jobs:
     - "zip -r cardano-wallet-$TRAVIS_TAG-win64.zip cardano-wallet-win64"
     - "rm -rf cardano-wallet-win64 cardano-wallet-win64.zip"
 
-    ############################
-    # jörmungandr
-    ############################
-
-    # Unpack and rename stuff for the Linux archive
-    - "tar xzf cardano-wallet-jormungandr-*-linux64.tar.gz"
-    - "mv cardano-wallet-jormungandr-*/ cardano-wallet-jormungandr-linux64"
-    - "mv cardano-wallet-jormungandr-linux64/cardano-wallet-jormungandr cardano-wallet-jormungandr-linux64/cardano-wallet"
-    - "./cardano-wallet-jormungandr-linux64/cardano-wallet --bash-completion-script cardano-wallet > auto-completion/bash/cardano-wallet.sh"
-    - "./cardano-wallet-jormungandr-linux64/cardano-wallet --zsh-completion-script  cardano-wallet > auto-completion/zsh/_cardano-wallet"
-    - "./cardano-wallet-jormungandr-linux64/cardano-wallet --fish-completion-script cardano-wallet > auto-completion/fish/cardano-wallet.fish"
-    - "cp -r auto-completion cardano-wallet-jormungandr-linux64"
-    - "./cardano-wallet-jormungandr-linux64/cardano-wallet version | grep -q $TRAVIS_COMMIT"
-    - "tar czf cardano-wallet-itn-$TRAVIS_TAG-linux64.tar.gz cardano-wallet-jormungandr-linux64"
-    - "rm -rf cardano-wallet-jormungandr-linux64 cardano-wallet-jormungandr-*-linux64.tar.gz"
-
-    # Unpack and rename stuff for the MacOS archive
-    - "tar xzf cardano-wallet-jormungandr-*-macos64.tar.gz"
-    - "mv cardano-wallet-jormungandr-*/ cardano-wallet-jormungandr-macos64"
-    - "mv cardano-wallet-jormungandr-macos64/cardano-wallet-jormungandr cardano-wallet-jormungandr-macos64/cardano-wallet"
-    - "cp -r auto-completion cardano-wallet-jormungandr-macos64"
-    - "tar czf cardano-wallet-itn-$TRAVIS_TAG-macos64.tar.gz cardano-wallet-jormungandr-macos64"
-    - "rm -rf cardano-wallet-jormungandr-macos64 cardano-wallet-jormungandr-*-macos64.tar.gz"
-
-    # Unpack and rename stuff for the Windows archive
-    - "unzip -d cardano-wallet-jormungandr-win64 cardano-wallet-jormungandr-*-win64.zip"
-    - "mv cardano-wallet-jormungandr-win64/cardano-wallet-jormungandr.exe cardano-wallet-jormungandr-win64/cardano-wallet.exe"
-    - "zip -r cardano-wallet-itn-$TRAVIS_TAG-win64.zip cardano-wallet-jormungandr-win64"
-    - "rm -rf cardano-wallet-jormungandr-win64 cardano-wallet-jormungandr-*-win64.zip"
-
     # Deploy documentation snapshot
     - mkdir -p api/$TRAVIS_TAG
     - cp -Rv specifications/api/* api/$TRAVIS_TAG
@@ -126,15 +92,9 @@ jobs:
       draft: true # Allow editing the release before publishing it officially on GitHub
       skip_cleanup: true # Make sure that files from the previous stages aren't cleaned up
       file:
-        # cardano-node
         - cardano-wallet-$TRAVIS_TAG-linux64.tar.gz
         - cardano-wallet-$TRAVIS_TAG-macos64.tar.gz
         - cardano-wallet-$TRAVIS_TAG-win64.zip
-
-        # Jörmungandr / ITN
-        - cardano-wallet-itn-$TRAVIS_TAG-linux64.tar.gz
-        - cardano-wallet-itn-$TRAVIS_TAG-macos64.tar.gz
-        - cardano-wallet-itn-$TRAVIS_TAG-win64.zip
       on:
         repo: input-output-hk/cardano-wallet
         branch: master

diff --git a/.weeder.yaml b/.weeder.yaml
@@ -33,36 +33,6 @@
       - module:
         - name: Cardano.Wallet.DB.StateMachine
         - identifier: showLabelledExamples
-- package:
-  - name: cardano-wallet-jormungandr
-  - section:
-    - name: test:jormungandr-integration bench:latency
-    - message:
-      - name: Module reused between components
-      - module:
-        - Cardano.Wallet.Jormungandr.Faucet
-        - Cardano.Wallet.Jormungandr.Launch
-        - Test.Integration.Jcli
-    - message:
-      - name: Weeds exported
-      - module:
-        - name: Cardano.Wallet.Jormungandr.Launch
-        - identifier: withBackendOnly
-  - section:
-    - name: test:unit
-    - message:
-      - name: Weeds exported
-      - module:
-        - name: Cardano.Wallet.Jormungandr.NetworkSpec
-        - identifier:
-          - C
-          - Consumer
-  - section:
-    - name: exe:cardano-wallet-jormungandr
-    - message:
-      - name: Redundant build-depends entry
-      - depends:
-        - cardano-addresses
 - package:
   - name: cardano-wallet-launcher
   - section:

diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ See **Installation Instructions** for each available [release](https://github.co
 >
 > | cardano-wallet | jörmungandr (compatible versions) | cardano-node (compatible versions) | SMASH (compatible versions)
 > | --- | --- | --- | ---
-> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
+> | `master` branch | [None](https://github.com/input-output-hk/cardano-wallet-jormungandr) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
 > | [v2020-11-03](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-11-03) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
 > | [v2020-10-13](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-10-13) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
 > | [v2020-09-30](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-09-30) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.20.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.20.0) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)

diff --git a/cabal.project b/cabal.project
@@ -11,7 +11,6 @@ packages:
   , lib/launcher/
   , lib/text-class/
   , lib/test-utils/
-  , lib/jormungandr/
   , lib/shelley/
 
 source-repository-package
@@ -355,9 +354,6 @@ package text-class
 package cardano-wallet-test-utils
     ghc-options: -ddump-to-file -ddump-hi
 
-package cardano-wallet-jormungandr
-    ghc-options: -ddump-to-file -ddump-hi
-
 package cardano-wallet
     ghc-options: -ddump-to-file -ddump-hi
 

diff --git a/default.nix b/default.nix
@@ -7,23 +7,21 @@
 #
 # Interesting top-level attributes:
 #
-#   - cardano-wallet-jormungandr - cli executable
 #   - cardano-wallet - cli executable
 #   - tests - attrset of test-suite executables
 #     - cardano-wallet-core.unit
-#     - cardano-wallet-jormungandr.jormungandr-integration
+#     - cardano-wallet.integration
 #     - etc (layout is PACKAGE.COMPONENT)
 #   - checks - attrset of test-suite results
 #     - cardano-wallet-core.unit
-#     - cardano-wallet-jormungandr.jormungandr-integration
+#     - cardano-wallet.integration
 #     - etc
 #   - benchmarks - attret of benchmark executables
 #     - cardano-wallet-core.db
-#     - cardano-wallet-jormungandr.latency
+#     - cardano-wallet.latency
 #     - etc
 #   - migration-tests - tests db migrations from previous versions
 #   - dockerImage - tarballs of the docker images
-#     - jormungandr
 #     - shelley
 #   - shell - imported by shell.nix
 #   - haskellPackages - a Haskell.nix package set of all packages and their dependencies
@@ -75,8 +73,6 @@ let
 
   self = {
     inherit pkgs commonLib src haskellPackages profiledHaskellPackages coveredHaskellPackages;
-    # Jormungandr
-    inherit (jmPkgs) jormungandr jormungandr-cli;
     # expose cardano-node, so daedalus can ship it without needing to pin cardano-node
     inherit (pkgs) cardano-node cardano-cli;
     inherit (haskellPackages.cardano-wallet-core.identifier) version;
@@ -87,13 +83,6 @@ let
     inherit (haskellPackages.cardano-addresses-cli.components.exes) cardano-address;
     inherit (haskellPackages.cardano-transactions.components.exes) cardano-tx;
 
-    cardano-wallet-jormungandr = import ./nix/package-jormungandr.nix {
-      inherit (haskellPackages.cardano-wallet-jormungandr.components.exes)
-        cardano-wallet-jormungandr;
-      inherit pkgs jmPkgs gitrev;
-      haskellBuildUtils = haskellBuildUtils.package;
-    };
-
     cardano-wallet = import ./nix/package-cardano-node.nix {
       inherit pkgs gitrev;
       haskellBuildUtils = haskellBuildUtils.package;
@@ -113,7 +102,6 @@ let
     dockerImage = 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;
     });
 

diff --git a/lib/jormungandr/README.md b/lib/jormungandr/README.md