Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update genesis hash mismatch error for Alonzo #3003

Merged
merged 1 commit into from
Aug 2, 2021
Merged

Update genesis hash mismatch error for Alonzo #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions cardano-node/src/Cardano/Node/Protocol/Cardano.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import Cardano.Node.Types
import Cardano.Tracing.OrphanInstances.Byron ()
import Cardano.Tracing.OrphanInstances.Shelley ()

import qualified Cardano.Node.Protocol.Alonzo as Alonzo
import qualified Cardano.Node.Protocol.Byron as Byron
import qualified Cardano.Node.Protocol.Shelley as Shelley
import qualified Cardano.Node.Protocol.Alonzo as Alonzo

import Cardano.Node.Protocol.Types

Expand Down Expand Up @@ -106,12 +106,12 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
Byron.readLeaderCredentials byronGenesis files

(shelleyGenesis, shelleyGenesisHash) <-
firstExceptT CardanoProtocolInstantiationGenesisReadError $
firstExceptT CardanoProtocolInstantiationShelleyGenesisReadError $
Shelley.readGenesis npcShelleyGenesisFile
npcShelleyGenesisFileHash

(alonzoGenesis, _alonzoGenesisHash) <-
firstExceptT CardanoProtocolInstantiationGenesisReadError $
firstExceptT CardanoProtocolInstantiationAlonzoGenesisReadError $
Alonzo.readGenesis npcAlonzoGenesisFile
npcAlonzoGenesisFileHash

Expand Down Expand Up @@ -260,7 +260,10 @@ data CardanoProtocolInstantiationError =
CardanoProtocolInstantiationErrorByron
Byron.ByronProtocolInstantiationError

| CardanoProtocolInstantiationGenesisReadError
| CardanoProtocolInstantiationShelleyGenesisReadError
Shelley.GenesisReadError

| CardanoProtocolInstantiationAlonzoGenesisReadError
Shelley.GenesisReadError

| CardanoProtocolInstantiationPraosLeaderCredentialsError
Expand All @@ -273,8 +276,10 @@ data CardanoProtocolInstantiationError =
instance Error CardanoProtocolInstantiationError where
displayError (CardanoProtocolInstantiationErrorByron err) =
displayError err
displayError (CardanoProtocolInstantiationGenesisReadError err) =
displayError err
displayError (CardanoProtocolInstantiationShelleyGenesisReadError err) =
"Shelley related: " <> displayError err
displayError (CardanoProtocolInstantiationAlonzoGenesisReadError err) =
"Alonzo related: " <> displayError err
displayError (CardanoProtocolInstantiationPraosLeaderCredentialsError err) =
displayError err
displayError (CardanoProtocolInstantiationErrorAlonzo err) =
Expand Down
4 changes: 2 additions & 2 deletions cardano-node/src/Cardano/Node/Protocol/Shelley.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ instance Error GenesisReadError where
<> toS fp <> " Error: " <> show err

displayError (GenesisHashMismatch actual expected) =
"Wrong Shelley genesis file: the actual hash is " <> show actual
<> ", but the expected Shelley genesis hash given in the node "
"Wrong genesis file: the actual hash is " <> show actual
<> ", but the expected genesis hash given in the node "
<> "configuration file is " <> show expected

displayError (GenesisDecodeError fp err) =
Expand Down