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

[CO-372] The Great Cleanup #3673

Merged
merged 24 commits into from
Nov 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4d8c6d6
[CO-394] Remove Legacy* and V0* stuff
KtorZ Sep 26, 2018
d92ec9d
[CO-373] Copy Mnemonic.hs to wallet-new as BIP39.hs
Anviking Sep 24, 2018
eb5643e
Merge pull request #3667 [remove legacy and V0] into CO-372/TheGreatC…
KtorZ Oct 11, 2018
0a0e966
[CO-373] Update BIP39Spec
Anviking Sep 25, 2018
7c83a83
[CO-373] Remove tools/dbgen executable and lib
Anviking Sep 27, 2018
633a4de
Merge pull request #3663 [move mnemonic implementation] into CO-372/T…
KtorZ Oct 11, 2018
bdd39b7
[CO-403] Remove the reference to the old wallet
parsonsmatt Sep 28, 2018
b776ed6
[CO-404] Remove old wallet types from Example
parsonsmatt Sep 28, 2018
37f8e84
Merge pull request #3686 [remove wallet dep from plugin] into CO-372/…
KtorZ Oct 11, 2018
35a42dd
[CO-405] Remove OldStorage instances & Modules
parsonsmatt Sep 28, 2018
b7446ab
Merge pull request #3687 [remove wallet dep from exmaples] into CO-37…
KtorZ Oct 11, 2018
c8848de
[CO-406] Remove swagger import
parsonsmatt Sep 28, 2018
b5c7755
Merge pull request #3688 [cleanup old storage] into CO-372/TheGreatCl…
KtorZ Oct 11, 2018
7124df6
Merge pull request #3689 [cleanup swagger impl] into CO-372/TheGreatC…
KtorZ Oct 11, 2018
dae77fe
[CO-402] Remove dependency on `Pos.Wallet.Web.Tracking.Decrypt`
Anviking Sep 28, 2018
fa1f46f
[CO-380] Removing Migration.hs Migration/Types.hs and Migration/Monad…
paweljakubas Oct 3, 2018
b917737
Merge pull request #3683 [no wallet in decrypt] into CO-372/TheGreatC…
KtorZ Oct 11, 2018
a09657e
Merge pull request #3700 [remove-migration-types] into CO-372/TheGrea…
KtorZ Oct 11, 2018
c2fd5cb
[CO-413] Removing wallet-new/src/Cardano/Wallet/Orphans*
paweljakubas Oct 4, 2018
9914a5c
[CO-426] Make Kernel/BIP39 completely free of Pos.Util.Mnemonic
KtorZ Oct 11, 2018
16d3e43
[CO-426] Move 'eitherToParser' into Cardano/Wallet/Util
KtorZ Oct 11, 2018
09bc990
[CO-430] Remove occurrences of cardano-sl-wallet
Anviking Oct 12, 2018
9d1d488
Merge branch 'CO-426' into CO-372/TheGreatCleanup
KtorZ Oct 22, 2018
78e61b1
Merge branch 'CO-430' into CO-372/TheGreatCleanup
KtorZ Oct 22, 2018
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 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 @@ -65,7 +65,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`:
- `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
3 changes: 2 additions & 1 deletion faucet/src/Cardano/Faucet/Init.hs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ import Cardano.Wallet.API.V1.Types (Account (..), Address,
import Cardano.Wallet.Client (ClientError (..), WalletClient (..),
WalletResponse (..), liftClient)
import Cardano.Wallet.Client.Http (mkHttpClient)
import Cardano.Wallet.Kernel.BIP39 (Mnemonic, entropyToMnemonic,
genEntropy)
import Pos.Core (Coin (..))
import Pos.Util.Mnemonic (Mnemonic, entropyToMnemonic, genEntropy)
import Universum

import Cardano.Faucet.Types
Expand Down
2 changes: 1 addition & 1 deletion faucet/src/Cardano/Faucet/Types/Config.hs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ import System.Remote.Monitoring.Statsd (StatsdOptions (..))
import Cardano.Wallet.API.V1.Types (AccountIndex, Payment,
PaymentSource (..), V1, WalletId (..))
import Cardano.Wallet.Client (ClientError (..), WalletClient (..))
import Cardano.Wallet.Kernel.BIP39 (Mnemonic)
import Pos.Core (Address (..))
import Pos.Util.Mnemonic (Mnemonic)
import Test.QuickCheck (Arbitrary (..), choose)
import Test.QuickCheck.Arbitrary.Generic
import Universum
Expand Down
22 changes: 2 additions & 20 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16553,7 +16553,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 @@ -16619,7 +16618,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 @@ -16669,7 +16667,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 @@ -16696,7 +16693,6 @@ aeson
base
bytestring
cardano-sl-core
cardano-sl-wallet
cardano-sl-wallet-new
hspec
mtl
Expand Down Expand Up @@ -17399,7 +17395,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 All @@ -17426,7 +17421,6 @@ license = stdenv.lib.licenses.mit;
, silently
, stdenv
, stm
, stm-chans
, string-conv
, tabl
, tar
Expand Down Expand Up @@ -17470,7 +17464,6 @@ cardano-sl-db
cardano-sl-infra
cardano-sl-networking
cardano-sl-util
cardano-sl-wallet
containers
data-default
directory
Expand All @@ -17490,7 +17483,6 @@ universum
unordered-containers
];
executableHaskellDepends = [
acid-state-exts
aeson
aeson-options
ansi-wl-pprint
Expand All @@ -17503,20 +17495,13 @@ cardano-report-server
cardano-sl
cardano-sl-binary
cardano-sl-chain
cardano-sl-chain-test
cardano-sl-client
cardano-sl-core
cardano-sl-core-test
cardano-sl-crypto
cardano-sl-db
cardano-sl-infra
cardano-sl-networking
cardano-sl-util
cardano-sl-wallet
cardano-sl-x509
containers
cryptonite
data-default
directory
filepath
formatting
Expand All @@ -17525,19 +17510,14 @@ lens
lifted-async
mtl
neat-interpolation
network-transport-tcp
optparse-applicative
optparse-generic
process
safe-exceptions
serokell-util
silently
stm
stm-chans
tabl
tar
text
time
time-units
universum
unix
Expand Down Expand Up @@ -18178,6 +18158,7 @@ license = stdenv.lib.licenses.mit;
, async
, base
, base58-bytestring
, basement
, beam-core
, beam-migrate
, beam-sqlite
Expand Down Expand Up @@ -18305,6 +18286,7 @@ aeson-pretty
async
base
base58-bytestring
basement
beam-core
beam-migrate
beam-sqlite
Expand Down
1 change: 0 additions & 1 deletion release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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
4 changes: 2 additions & 2 deletions scripts/generate-mnemonic.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#!nix-shell -i runhaskell ../wallet-new/default.nix
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeApplications #-}
import Cardano.Wallet.Kernel.BIP39 (EntropySize, Mnemonic,
entropyToMnemonic, genEntropy)
import Data.Aeson (encode)
import Data.ByteString.Lazy.Char8 (unpack)
import Pos.Util.Mnemonic (EntropySize, Mnemonic, entropyToMnemonic,
genEntropy)

main = do
backupPhrase <- generateBackupPhrase
Expand Down
3 changes: 1 addition & 2 deletions scripts/test/wallet/swaggerSchemaValidation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ let
validate-json = "${validateJson}/bin/validate_json";
schema = ./../../../tools/src/validate-json/swagger-meta-2.0.json;
in writeScript "validate-swagger-schema" ''
${generate-swagger-file} --target wallet@v0 --output-file swagger.v0.json
${generate-swagger-file} --target wallet@v1 --output-file swagger.v1.json
${validate-json} --schema ${schema} swagger.v0.json && ${validate-json} --schema ${schema} swagger.v1.json
${validate-json} --schema ${schema} swagger.v1.json
EXIT_STATUS=$?
rm -f swagger.*.json
exit $EXIT_STATUS
Expand Down
77 changes: 0 additions & 77 deletions tools/cardano-sl-tools.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -23,71 +23,6 @@ Flag for-installer
description: Build a reduced set of components (only what is needed for the
installer)

executable dbgen
hs-source-dirs: src/dbgen
main-is: Main.hs
if !flag(for-installer)
build-depends: base >= 4.7 && < 5
, acid-state-exts
, cardano-sl
, cardano-sl-chain-test
, cardano-sl-client
, cardano-sl-core
, cardano-sl-core-test
, cardano-sl-db
, cardano-sl-infra
, cardano-sl-networking
, cardano-sl-tools
, cardano-sl-chain
, cardano-sl-util
, cardano-sl-wallet
, containers
, data-default
, network-transport-tcp >= 0.6
, optparse-generic
, stm
, stm-chans
, text
, time
, time-units
, universum >= 0.1.11
, unordered-containers
default-language: Haskell2010
ghc-options: -threaded -rtsopts
-Wall
-O2

-- linker speed up for linux
if os(linux)
ghc-options: -optl-fuse-ld=gold
ld-options: -fuse-ld=gold

default-extensions: DeriveDataTypeable
DeriveGeneric
GeneralizedNewtypeDeriving
StandaloneDeriving
FlexibleContexts
FlexibleInstances
MultiParamTypeClasses
FunctionalDependencies
DefaultSignatures
NoImplicitPrelude
OverloadedStrings
TypeApplications
TupleSections
ViewPatterns
LambdaCase
MultiWayIf
ConstraintKinds
UndecidableInstances
BangPatterns
ScopedTypeVariables

build-tools: cpphs >= 1.19
ghc-options: -pgmP cpphs -optP --cpp

if flag(for-installer)
buildable: False

executable cardano-genupdate
hs-source-dirs: src/genupdate
Expand Down Expand Up @@ -425,13 +360,6 @@ library
Pos.Tools.Launcher.Environment
Pos.Tools.Launcher.Logging

-- Dbgen
Pos.Tools.Dbgen.CLI
Pos.Tools.Dbgen.Lib
Pos.Tools.Dbgen.Rendering
Pos.Tools.Dbgen.Stats
Pos.Tools.Dbgen.Types

build-depends: base >= 4.7 && < 5
, QuickCheck
, acid-state-exts
Expand All @@ -448,7 +376,6 @@ library
, cardano-sl-infra
, cardano-sl-networking
, cardano-sl-util
, cardano-sl-wallet
, containers
, data-default
, directory
Expand Down Expand Up @@ -477,10 +404,6 @@ test-suite cardano-sl-tools-test
-- Subject
Test.Pos.Tools.Launcher.Environment

-- Dbgen Tests
Test.Pos.Tools.Dbgen.Gen
Test.Pos.Tools.Dbgen.Json

type: exitcode-stdio-1.0
build-depends: aeson
, base
Expand Down
Loading