cleaning integration tests

Author: paweljakubas

lib/byron/test/integration/Test/Integration/Byron/Scenario/API/Transactions.hs

@@ -69,6 +69,7 @@ import Test.Integration.Framework.DSL
     , fixtureIcarusWalletAddrs
     , fixtureIcarusWalletWith
     , fixturePassphrase
+    , fixturePassphraseEncrypted
     , fixtureRandomWallet
     , fixtureRandomWalletAddrs
     , fixtureRandomWalletMws
@@ -515,14 +516,8 @@ scenario_RESTORE_01 fixtureSource = it title $ \ctx -> do
     let rootXPrv = T.decodeUtf8 $ hex $ getKey $
             generateKeyFromSeed seed
             (Passphrase $ BA.convert $ T.encodeUtf8 fixturePassphrase)
-    let passwHash =
-            "31347c387c317c2b6a6f747446495a6a566d586f43374c6c54425a576c\
-            \597a425834515177666475467578436b4d485569733d7c78324d646738\
-            \49554a3232507235676531393575445a76583646552b7757395a6a6a2f\
-            \51303054356c654751794279732f7662753367526d726c316c657a7150\
-            \43676d364e6758476d4d2f4b6438343265304b4945773d3d"
     wDestRestored <- emptyByronWalletFromXPrvWith ctx "random"
-            ("Byron Wallet Restored", rootXPrv, passwHash)
+            ("Byron Wallet Restored", rootXPrv, fixturePassphraseEncrypted)
     eventually "destination balance increases" $ do
         rDest <- request @ApiByronWallet ctx
             (Link.getWallet @'Byron wDestRestored) Default Empty

lib/core-integration/src/Test/Integration/Framework/DSL.hs

@@ -87,6 +87,7 @@ module Test.Integration.Framework.DSL
     , eventually
     , eventuallyUsingDelay
     , fixturePassphrase
+    , fixturePassphraseEncrypted
     , waitForNextEpoch
     , waitAllTxsInLedger
     , toQueryString
@@ -658,11 +659,19 @@ fixtureRawTx ctx (addr, amt) =
         BL.fromStrict <$> build (addr, Coin $ fromIntegral amt)
 
 -- | Default passphrase used for fixture wallets
-fixturePassphrase
-    :: Text
+fixturePassphrase :: Text
 fixturePassphrase =
     "cardano-wallet"
 
+-- | fixturePassphrase encrypted by Scrypt function
+fixturePassphraseEncrypted :: Text
+fixturePassphraseEncrypted =
+    "31347c387c317c2b6a6f747446495a6a566d586f43374c6c54425a576c\
+    \597a425834515177666475467578436b4d485569733d7c78324d646738\
+    \49554a3232507235676531393575445a76583646552b7757395a6a6a2f\
+    \51303054356c654751794279732f7662753367526d726c316c657a7150\
+    \43676d364e6758476d4d2f4b6438343265304b4945773d3d"
+
 -- | Restore a faucet and wait until funds are available.
 fixtureWallet
     :: Context t

lib/core-integration/src/Test/Integration/Scenario/API/ByronWallets.hs

@@ -22,14 +22,7 @@ import Cardano.Wallet.Api.Types
     , WalletStyle (..)
     )
 import Cardano.Wallet.Primitive.AddressDerivation
-    ( FromMnemonic (..)
-    , Passphrase (..)
-    , PassphraseMaxLength (..)
-    , PassphraseMinLength (..)
-    , hex
-    )
-import Cardano.Wallet.Primitive.AddressDerivation.Byron
-    ( ByronKey (..), generateKeyFromSeed )
+    ( PassphraseMaxLength (..), PassphraseMinLength (..) )
 import Cardano.Wallet.Primitive.Mnemonic
     ( ConsistentEntropy
     , EntropySize
@@ -60,7 +53,6 @@ import Test.Integration.Framework.DSL
     ( Context (..)
     , Headers (..)
     , Payload (..)
-    , emptyByronWalletFromXPrvWith
     , emptyByronWalletWith
     , emptyIcarusWallet
     , emptyRandomWallet
@@ -95,9 +87,7 @@ import Test.Integration.Framework.TestData
     )
 
 import qualified Cardano.Wallet.Api.Link as Link
-import qualified Data.ByteArray as BA
 import qualified Data.Text as T
-import qualified Data.Text.Encoding as T
 import qualified Network.HTTP.Types.Status as HTTP
 
 spec :: forall n t.
@@ -409,30 +399,6 @@ spec = do
             [ expectResponseCode @IO HTTP.status201
             , expectField (#balance . #available) (`shouldBe` Quantity faucetAmt)
             ]
-
-    it "BYRON_RESTORE_10 - Can restore wallet using master root key" $ \ctx -> do
-        m <- genMnemonics @12
-        let passw = "Secure Passphrase"
-        w1 <- emptyByronWalletWith ctx "random"
-             ("Byron Wallet", m, passw)
-        rd1 <- request
-              @ApiByronWallet ctx (Link.deleteWallet @'Byron w1) Default Empty
-        expectResponseCode @IO HTTP.status204 rd1
-
-        let (Right seed) = fromMnemonic @'[12] m
-        let rootXPrv = T.decodeUtf8 $ hex $ getKey $
-                generateKeyFromSeed seed (Passphrase $ BA.convert $ T.encodeUtf8 passw)
-        let passwHash =
-                "31347c387c317c714968506842665966555a336f5156434c384449744b\
-                \677642417a6c584d62314d6d4267695433776a556f3d7c53672b436e30\
-                \4232766b4475682f704265335569694577633364385845756f55737661\
-                \42514e62464443353569474f4135736e453144326743346f47564c472b\
-                \524331385958326c6863552f36687a38432f496172773d3d"
-        w2 <- emptyByronWalletFromXPrvWith ctx "random"
-            ("Byron Wallet", rootXPrv, passwHash)
-        rd2 <- request
-              @ApiByronWallet ctx (Link.deleteWallet @'Byron w2) Default Empty
-        expectResponseCode @IO HTTP.status204 rd2
  where
      genMnemonics
         :: forall mw ent csz.