Skip to content

Commit

Permalink
Merge #2012
Browse files Browse the repository at this point in the history
2012: Remove cardano-wallet-byron package r=Anviking a=Anviking



# Issue Number

#1919 


# Overview

- [x] `rm -rf lib/byron`
- [x] Remove nix and CI stuff relating to it


# Comments

```
Since cardano-wallet-shelley is now targeting the mainnet, we can remove
the byron package.

We should perhaps concider renaming cardano-wallet-shelley to simply
cardano-wallet.
```

<!-- Additional comments or screenshots to attach if any -->

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Johannes Lund <[email protected]>
  • Loading branch information
iohk-bors[bot] and Anviking authored Aug 10, 2020
2 parents 34a923c + bb92ae8 commit a7670ed
Show file tree
Hide file tree
Showing 37 changed files with 8 additions and 10,535 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
Get-ChildItem
- name: 'cardano-wallet-core:unit'
run: '.\\cardano-wallet-core-test-unit.exe --color'
- name: 'cardano-wallet-byron:unit'
run: '.\\cardano-wallet-byron-test-unit.exe --color'
- name: 'cardano-wallet-shelley:unit'
run: '.\\cardano-wallet-shelley-test-unit.exe --color'
- name: 'cardano-wallet-cli:unit'
Expand All @@ -38,9 +36,6 @@ jobs:
- name: 'cardano-wallet-shelley:integration'
run: '.\\cardano-wallet-shelley-test-integration.exe --color'
timeout-minutes: 60
- name: 'cardano-wallet-byron:integration'
run: '.\\cardano-wallet-byron-test-integration.exe --color'
timeout-minutes: 60
- name: 'cardano-wallet-jormungandr:unit'
run: '.\\cardano-wallet-jormungandr-test-unit.exe --color'
- name: 'cardano-wallet-jormungandr:integration'
Expand Down
17 changes: 0 additions & 17 deletions .weeder.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
- package:
- name: cardano-wallet-byron
- section:
- name: bench:restore
- message:
- name: Weeds exported
- module:
- name: Cardano.Wallet.Primitive.AddressDiscovery.Any.TH
- identifier:
- AnyAddressStateId
- AnyAddressStateKey
- AnyAddressStateProportion
- section:
- name: test:integration bench:latency
- message:
- name: Module reused between components
- module: Cardano.Wallet.Byron.Faucet
- package:
- name: cardano-wallet-shelley
- section:
Expand Down
13 changes: 0 additions & 13 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,22 @@
# Interesting top-level attributes:
#
# - cardano-wallet-jormungandr - cli executable
# - cardano-wallet-byron - cli executable
# - cardano-wallet-shelley - cli executable
# - tests - attrset of test-suite executables
# - cardano-wallet-core.unit
# - cardano-wallet-jormungandr.jormungandr-integration
# - cardano-wallet-byron.integration
# - etc (layout is PACKAGE.COMPONENT)
# - checks - attrset of test-suite results
# - cardano-wallet-core.unit
# - cardano-wallet-jormungandr.jormungandr-integration
# - cardano-wallet-byron.integration
# - etc
# - benchmarks - attret of benchmark executables
# - cardano-wallet-core.db
# - cardano-wallet-jormungandr.latency
# - cardano-wallet-byron.restore
# - etc
# - migration-tests - tests db migrations from previous versions
# - dockerImage - tarballs of the docker images
# - jormungandr
# - byron
# - shelley
# - shell - imported by shell.nix
# - haskellPackages - a Haskell.nix package set of all packages and their dependencies
Expand Down Expand Up @@ -98,13 +93,6 @@ let
haskellBuildUtils = haskellBuildUtils.package;
};

cardano-wallet-byron = import ./nix/package-cardano-node.nix {
inherit pkgs gitrev;
haskellBuildUtils = haskellBuildUtils.package;
exe = haskellPackages.cardano-wallet-byron.components.exes.cardano-wallet-byron;
inherit (self) cardano-node;
};

cardano-wallet-shelley = import ./nix/package-cardano-node.nix {
inherit pkgs gitrev;
haskellBuildUtils = haskellBuildUtils.package;
Expand All @@ -123,7 +111,6 @@ let
mkDockerImage = backend: exe: pkgs.callPackage ./nix/docker.nix { inherit backend exe; };
in recurseIntoAttrs (mapAttrs mkDockerImage {
jormungandr = self.cardano-wallet-jormungandr;
byron = self.cardano-wallet-byron;
shelley = self.cardano-wallet-shelley;
});

Expand Down
108 changes: 0 additions & 108 deletions lib/byron/bench/Cardano/Wallet/Primitive/AddressDiscovery/Any.hs

This file was deleted.

This file was deleted.

Loading

0 comments on commit a7670ed

Please sign in to comment.