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

Commit 9e7afa8

Browse files
KtorZKtorZ
committed
Merge pull request #3663 from input-output-hk/anviking/CO-373/move-mnemonic
[CO-373] Move `[email protected]` to `[email protected]`
2 parents af27e67 + 08efbe2 commit 9e7afa8

File tree

24 files changed

+529
-1540
lines changed

24 files changed

+529
-1540
lines changed

‎faucet/src/Cardano/Faucet/Init.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ import Cardano.Wallet.API.V1.Types (Account (..), Address,
6060
import Cardano.Wallet.Client (ClientError (..), WalletClient (..),
6161
WalletResponse (..), liftClient)
6262
import Cardano.Wallet.Client.Http (mkHttpClient)
63+
import Cardano.Wallet.Kernel.BIP39 (Mnemonic, entropyToMnemonic,
64+
genEntropy)
6365
import Pos.Core (Coin (..))
64-
import Pos.Util.Mnemonic (Mnemonic, entropyToMnemonic, genEntropy)
6566
import Universum
6667

6768
import Cardano.Faucet.Types

‎faucet/src/Cardano/Faucet/Types/Config.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import System.Remote.Monitoring.Statsd (StatsdOptions (..))
4545
import Cardano.Wallet.API.V1.Types (AccountIndex, Payment,
4646
PaymentSource (..), V1, WalletId (..))
4747
import Cardano.Wallet.Client (ClientError (..), WalletClient (..))
48+
import Cardano.Wallet.Kernel.BIP39 (Mnemonic)
4849
import Pos.Core (Address (..))
49-
import Pos.Util.Mnemonic (Mnemonic)
5050
import Test.QuickCheck (Arbitrary (..), choose)
5151
import Test.QuickCheck.Arbitrary.Generic
5252
import Universum

‎pkgs/default.nix

+2-12
Original file line numberDiff line numberDiff line change
@@ -17364,7 +17364,6 @@ universum
1736417364
unordered-containers
1736517365
];
1736617366
executableHaskellDepends = [
17367-
acid-state-exts
1736817367
aeson
1736917368
aeson-options
1737017369
ansi-wl-pprint
@@ -17377,20 +17376,13 @@ cardano-report-server
1737717376
cardano-sl
1737817377
cardano-sl-binary
1737917378
cardano-sl-chain
17380-
cardano-sl-chain-test
17381-
cardano-sl-client
1738217379
cardano-sl-core
17383-
cardano-sl-core-test
1738417380
cardano-sl-crypto
1738517381
cardano-sl-db
1738617382
cardano-sl-infra
17387-
cardano-sl-networking
1738817383
cardano-sl-util
17389-
cardano-sl-wallet
1739017384
cardano-sl-x509
17391-
containers
1739217385
cryptonite
17393-
data-default
1739417386
directory
1739517387
filepath
1739617388
formatting
@@ -17399,18 +17391,14 @@ lens
1739917391
lifted-async
1740017392
mtl
1740117393
neat-interpolation
17402-
network-transport-tcp
1740317394
optparse-applicative
17404-
optparse-generic
1740517395
process
1740617396
safe-exceptions
1740717397
serokell-util
1740817398
silently
17409-
stm
1741017399
tabl
1741117400
tar
1741217401
text
17413-
time
1741417402
time-units
1741517403
universum
1741617404
unix
@@ -18037,6 +18025,7 @@ license = stdenv.lib.licenses.mit;
1803718025
, async
1803818026
, base
1803918027
, base58-bytestring
18028+
, basement
1804018029
, beam-core
1804118030
, beam-migrate
1804218031
, beam-sqlite
@@ -18162,6 +18151,7 @@ aeson-pretty
1816218151
async
1816318152
base
1816418153
base58-bytestring
18154+
basement
1816518155
beam-core
1816618156
beam-migrate
1816718157
beam-sqlite

‎scripts/generate-mnemonic.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
#!nix-shell -i runhaskell ../wallet-new/default.nix
33
{-# LANGUAGE DataKinds #-}
44
{-# LANGUAGE TypeApplications #-}
5+
import Cardano.Wallet.Kernel.BIP39 (EntropySize, Mnemonic,
6+
entropyToMnemonic, genEntropy)
57
import Data.Aeson (encode)
68
import Data.ByteString.Lazy.Char8 (unpack)
7-
import Pos.Util.Mnemonic (EntropySize, Mnemonic, entropyToMnemonic,
8-
genEntropy)
99

1010
main = do
1111
backupPhrase <- generateBackupPhrase

‎tools/cardano-sl-tools.cabal

-75
Original file line numberDiff line numberDiff line change
@@ -23,70 +23,6 @@ Flag for-installer
2323
description: Build a reduced set of components (only what is needed for the
2424
installer)
2525

26-
executable dbgen
27-
hs-source-dirs: src/dbgen
28-
main-is: Main.hs
29-
if !flag(for-installer)
30-
build-depends: base >= 4.7 && < 5
31-
, acid-state-exts
32-
, cardano-sl
33-
, cardano-sl-chain-test
34-
, cardano-sl-client
35-
, cardano-sl-core
36-
, cardano-sl-core-test
37-
, cardano-sl-db
38-
, cardano-sl-infra
39-
, cardano-sl-networking
40-
, cardano-sl-tools
41-
, cardano-sl-chain
42-
, cardano-sl-util
43-
, cardano-sl-wallet
44-
, containers
45-
, data-default
46-
, network-transport-tcp >= 0.6
47-
, optparse-generic
48-
, stm
49-
, text
50-
, time
51-
, time-units
52-
, universum >= 0.1.11
53-
, unordered-containers
54-
default-language: Haskell2010
55-
ghc-options: -threaded -rtsopts
56-
-Wall
57-
-O2
58-
59-
-- linker speed up for linux
60-
if os(linux)
61-
ghc-options: -optl-fuse-ld=gold
62-
ld-options: -fuse-ld=gold
63-
64-
default-extensions: DeriveDataTypeable
65-
DeriveGeneric
66-
GeneralizedNewtypeDeriving
67-
StandaloneDeriving
68-
FlexibleContexts
69-
FlexibleInstances
70-
MultiParamTypeClasses
71-
FunctionalDependencies
72-
DefaultSignatures
73-
NoImplicitPrelude
74-
OverloadedStrings
75-
TypeApplications
76-
TupleSections
77-
ViewPatterns
78-
LambdaCase
79-
MultiWayIf
80-
ConstraintKinds
81-
UndecidableInstances
82-
BangPatterns
83-
ScopedTypeVariables
84-
85-
build-tools: cpphs >= 1.19
86-
ghc-options: -pgmP cpphs -optP --cpp
87-
88-
if flag(for-installer)
89-
buildable: False
9026

9127
executable cardano-genupdate
9228
hs-source-dirs: src/genupdate
@@ -424,13 +360,6 @@ library
424360
Pos.Tools.Launcher.Environment
425361
Pos.Tools.Launcher.Logging
426362

427-
-- Dbgen
428-
Pos.Tools.Dbgen.CLI
429-
Pos.Tools.Dbgen.Lib
430-
Pos.Tools.Dbgen.Rendering
431-
Pos.Tools.Dbgen.Stats
432-
Pos.Tools.Dbgen.Types
433-
434363
build-depends: base >= 4.7 && < 5
435364
, QuickCheck
436365
, acid-state-exts
@@ -476,10 +405,6 @@ test-suite cardano-sl-tools-test
476405
-- Subject
477406
Test.Pos.Tools.Launcher.Environment
478407

479-
-- Dbgen Tests
480-
Test.Pos.Tools.Dbgen.Gen
481-
Test.Pos.Tools.Dbgen.Json
482-
483408
type: exitcode-stdio-1.0
484409
build-depends: aeson
485410
, base

‎tools/src/Pos/Tools/Dbgen/CLI.hs

-81
This file was deleted.

0 commit comments

Comments
 (0)