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.

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

create-staked: simplify some code #497

Merged
merged 1 commit into from
Dec 4, 2023
Merged
Changes from all commits
Commits
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
62 changes: 23 additions & 39 deletions cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,9 @@ runGenesisKeyGenGenesisCmd
} = do
skey <- liftIO $ generateSigningKey AsGenesisKey
let vkey = getVerificationKey skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile signingKeyPath
$ textEnvelopeToJSON (Just skeyDesc) skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile verificationKeyPath
$ textEnvelopeToJSON (Just Key.genesisVkeyDesc) vkey
firstExceptT GenesisCmdGenesisFileError . newExceptT $ do
void $ writeLazyByteStringFile signingKeyPath $ textEnvelopeToJSON (Just skeyDesc) skey
writeLazyByteStringFile verificationKeyPath $ textEnvelopeToJSON (Just Key.genesisVkeyDesc) vkey
where
skeyDesc :: TextEnvelopeDescr
skeyDesc = "Genesis Signing Key"
Expand All @@ -191,21 +186,16 @@ runGenesisKeyGenDelegateCmd
} = do
skey <- liftIO $ generateSigningKey AsGenesisDelegateKey
let vkey = getVerificationKey skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile signingKeyPath
$ textEnvelopeToJSON (Just skeyDesc) skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile verificationKeyPath
$ textEnvelopeToJSON (Just Key.genesisVkeyDelegateDesc) vkey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile opCertCounterPath
$ textEnvelopeToJSON (Just certCtrDesc)
$ OperationalCertificateIssueCounter
initialCounter
(castVerificationKey vkey) -- Cast to a 'StakePoolKey'
firstExceptT GenesisCmdGenesisFileError . newExceptT $ do
void $ writeLazyByteStringFile signingKeyPath
$ textEnvelopeToJSON (Just skeyDesc) skey
void $ writeLazyByteStringFile verificationKeyPath
$ textEnvelopeToJSON (Just Key.genesisVkeyDelegateDesc) vkey
writeLazyByteStringFile opCertCounterPath
$ textEnvelopeToJSON (Just certCtrDesc)
$ OperationalCertificateIssueCounter
initialCounter
(castVerificationKey vkey) -- Cast to a 'StakePoolKey'
where
skeyDesc, certCtrDesc :: TextEnvelopeDescr
skeyDesc = "Genesis delegate operator key"
Expand All @@ -223,14 +213,11 @@ runGenesisKeyGenDelegateVRF ::
runGenesisKeyGenDelegateVRF vkeyPath skeyPath = do
skey <- liftIO $ generateSigningKey AsVrfKey
let vkey = getVerificationKey skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile skeyPath
$ textEnvelopeToJSON (Just skeyDesc) skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile vkeyPath
$ textEnvelopeToJSON (Just vkeyDesc) vkey
firstExceptT GenesisCmdGenesisFileError . newExceptT $ do
void $ writeLazyByteStringFile skeyPath
$ textEnvelopeToJSON (Just skeyDesc) skey
writeLazyByteStringFile vkeyPath
$ textEnvelopeToJSON (Just vkeyDesc) vkey
where
skeyDesc, vkeyDesc :: TextEnvelopeDescr
skeyDesc = "VRF Signing Key"
Expand All @@ -247,14 +234,11 @@ runGenesisKeyGenUTxOCmd
} = do
skey <- liftIO $ generateSigningKey AsGenesisUTxOKey
let vkey = getVerificationKey skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile signingKeyPath
$ textEnvelopeToJSON (Just skeyDesc) skey
firstExceptT GenesisCmdGenesisFileError
. newExceptT
$ writeLazyByteStringFile verificationKeyPath
$ textEnvelopeToJSON (Just vkeyDesc) vkey
firstExceptT GenesisCmdGenesisFileError . newExceptT $ do
void $ writeLazyByteStringFile signingKeyPath
$ textEnvelopeToJSON (Just skeyDesc) skey
writeLazyByteStringFile verificationKeyPath
$ textEnvelopeToJSON (Just vkeyDesc) vkey
where
skeyDesc, vkeyDesc :: TextEnvelopeDescr
skeyDesc = "Genesis Initial UTxO Signing Key"
Expand Down