Skip to content

Commit

Permalink
Remove cardanoCliEra from cluster setup
Browse files Browse the repository at this point in the history
  • Loading branch information
Anviking committed Apr 19, 2021
1 parent 044dcd0 commit a5acc78
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions lib/shelley/src/Cardano/Wallet/Shelley/Launch/Cluster.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,6 @@ preparePoolRegistration tr era dir stakePub certs pledgeAmt = do
, "--ttl", "400"
, "--fee", show (faucetAmt - pledgeAmt - depositAmt)
, "--out-file", file
, cardanoCliEra era
] ++ mconcat ((\cert -> ["--certificate-file",cert]) <$> certs)

pure (file, faucetPrv)
Expand Down Expand Up @@ -1294,7 +1293,6 @@ sendFaucet tr conn dir what targets = do
-- before the wallet API supports it.
, "--fee", show (faucetAmt - total)
, "--out-file", file
, cardanoCliEra era
] ++
concatMap (uncurry mkOutput . fmap fst) targets ++
mkMint targetAssets
Expand Down Expand Up @@ -1343,7 +1341,6 @@ moveInstantaneousRewardsTo tr conn dir targets = do
, "--fee", show (faucetAmt - 1_000_000 - totalDeposit)
, "--tx-out", sink <> "+" <> "1000000"
, "--out-file", file
, cardanoCliEra era
] ++ concatMap (\x -> ["--certificate-file", x]) (mconcat certs)

testData <- getShelleyTestDataPath
Expand Down Expand Up @@ -1407,7 +1404,6 @@ prepareKeyRegistration tr era dir = do
, "--fee", show (faucetAmt - depositAmt - 1_000_000)
, "--certificate-file", cert
, "--out-file", file
, cardanoCliEra era
]
pure (file, faucetPrv)

Expand Down Expand Up @@ -1487,7 +1483,6 @@ waitUntilRegistered tr conn name era opPub = do
(exitCode, distribution, err) <- cliNode tr conn
[ "query", "stake-distribution"
, "--mainnet"
, cardanoCliEra era
]
traceWith tr $ MsgStakeDistribution name exitCode distribution err
unless (BL8.toStrict poolId `BS.isInfixOf` BL8.toStrict distribution) $ do
Expand Down Expand Up @@ -1642,9 +1637,6 @@ resetGlobals = do
void $ swapMVar faucetIndex 1
void $ swapMVar operators operatorsFixture

cardanoCliEra :: ClusterEra -> String
cardanoCliEra era = "--" ++ clusterEraName era ++ "-era"

getClusterEra :: FilePath -> IO ClusterEra
getClusterEra dir = read <$> readFile (dir </> "era")

Expand Down

0 comments on commit a5acc78

Please sign in to comment.