Skip to content

Commit 2b8109d

Browse files
authored
Every network needs checkpoints.json (#2502)
And sanchonet is gone.
2 parents ff4fa8b + 3558611 commit 2b8109d

File tree

5 files changed

+2
-11
lines changed

5 files changed

+2
-11
lines changed

hydra-cluster/src/CardanoNode.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,12 @@ withCardanoNodeOnKnownNetwork tracer stateDirectory knownNetwork action = do
267267
createDirectoryIfMissing True $ stateDirectory </> takeDirectory fn
268268
fetchConfigFile (knownNetworkPath </> fn)
269269
>>= writeFileBS (stateDirectory </> fn)
270-
case knownNetwork of
271-
Mainnet -> forM_ ["checkpoints.json"] $
270+
when (knownNetwork `elem` [Mainnet, Preview]) $ do
271+
forM_ ["checkpoints.json"] $
272272
\fn -> do
273273
createDirectoryIfMissing True $ stateDirectory </> takeDirectory fn
274274
fetchConfigFile (knownNetworkPath </> fn)
275275
>>= writeFileBS (stateDirectory </> fn)
276-
_ -> pure ()
277276

278277
knownNetworkPath =
279278
knownNetworkConfigBaseURL </> knownNetworkName
@@ -286,7 +285,6 @@ withCardanoNodeOnKnownNetwork tracer stateDirectory knownNetwork action = do
286285
Preview -> "environments-pre/preview"
287286
Preproduction -> "environments-pre/preprod"
288287
Mainnet -> "environments/mainnet"
289-
Sanchonet -> "environments/sanchonet"
290288
-- NOTE: Here we map blockfrost networks to cardano ones since we expect to find actor keys
291289
-- in known locations when running smoke-tests.
292290
BlockfrostPreview -> "environments-pre/preview"

hydra-cluster/src/Hydra/Cluster/Fixture.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ data KnownNetwork
7474
= Preview
7575
| Preproduction
7676
| Mainnet
77-
| Sanchonet
7877
| BlockfrostPreview
7978
| BlockfrostPreprod
8079
| BlockfrostMainnet
@@ -86,7 +85,6 @@ toNetworkId = \case
8685
Mainnet -> Api.Mainnet
8786
Preproduction -> Api.Testnet (Api.NetworkMagic 1)
8887
Preview -> Api.Testnet (Api.NetworkMagic 2)
89-
Sanchonet -> Api.Testnet (Api.NetworkMagic 4)
9088
BlockfrostPreview -> Api.Testnet (Api.NetworkMagic 2)
9189
BlockfrostPreprod -> Api.Testnet (Api.NetworkMagic 1)
9290
BlockfrostMainnet -> Api.Mainnet

hydra-cluster/src/Hydra/Cluster/Mithril.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ downloadLatestSnapshotTo tracer network directory = do
6161
Mainnet -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/release-mainnet/genesis.vkey"
6262
Preproduction -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/release-preprod/genesis.vkey"
6363
Preview -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/pre-release-preview/genesis.vkey"
64-
Sanchonet -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/genesis.vkey"
6564
BlockfrostPreview -> Nothing
6665
BlockfrostPreprod -> Nothing
6766
BlockfrostMainnet -> Nothing
@@ -70,7 +69,6 @@ downloadLatestSnapshotTo tracer network directory = do
7069
Mainnet -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/release-mainnet/ancillary.vkey"
7170
Preproduction -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/release-preprod/ancillary.vkey"
7271
Preview -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/pre-release-preview/ancillary.vkey"
73-
Sanchonet -> Just "https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/testing-sanchonet/ancillary.vkey"
7472
BlockfrostPreview -> Nothing
7573
BlockfrostPreprod -> Nothing
7674
BlockfrostMainnet -> Nothing
@@ -79,7 +77,6 @@ downloadLatestSnapshotTo tracer network directory = do
7977
Mainnet -> Just "https://aggregator.release-mainnet.api.mithril.network/aggregator"
8078
Preproduction -> Just "https://aggregator.release-preprod.api.mithril.network/aggregator"
8179
Preview -> Just "https://aggregator.pre-release-preview.api.mithril.network/aggregator"
82-
Sanchonet -> Just "https://aggregator.testing-sanchonet.api.mithril.network/aggregator"
8380
BlockfrostPreview -> Nothing
8481
BlockfrostPreprod -> Nothing
8582
BlockfrostMainnet -> Nothing

hydra-cluster/src/Hydra/Cluster/Options.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ parseOptions =
4848
flag' (Just Preview) (long "preview" <> help "The preview testnet")
4949
<|> flag' (Just Preproduction) (long "preprod" <> help "The pre-production testnet")
5050
<|> flag' (Just Mainnet) (long "mainnet" <> help "The mainnet")
51-
<|> flag' (Just Sanchonet) (long "sanchonet" <> help "The sanchonet preview testnet")
5251
<|> flag' (Just BlockfrostPreview) (long "blockfrost-preview" <> help "The preview testnet using Blockfrost")
5352
<|> flag' (Just BlockfrostPreprod) (long "blockfrost-preprod" <> help "The pre-production testnet using Blockfrost")
5453
<|> flag' (Just BlockfrostMainnet) (long "blockfrost-mainnet" <> help "The mainnet using Blockfrost")

hydra-cluster/test/Test/Hydra/Cluster/MithrilSpec.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ spec = parallel $ do
1818
describe "downloadLatestSnapshotTo" $
1919
forEachKnownNetwork "invokes mithril-client correctly" $ \network -> do
2020
let blockfrostNetworks = [BlockfrostPreview, BlockfrostPreprod, BlockfrostMainnet]
21-
when (network == Sanchonet) $ pendingWith "Sanchonet not available anymore"
2221
when (network `elem` blockfrostNetworks) $ pendingWith "Blockfrost doesn't need mithril to run"
2322
(tracer, getTraces) <- captureTracer "MithrilSpec"
2423
withTempDir ("mithril-download-" <> show network) $ \tmpDir -> do

0 commit comments

Comments
 (0)