Updating Delegate Representative to Delegated Representative to match…

… the revised wording on CIP1694.
IntersectMBO · Jul 11, 2024 · 84e4f4e · 84e4f4e
1 parent 1c70add
commit 84e4f4e
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 18 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -3140,7 +3140,7 @@ pVoterType :: Parser VType
 pVoterType =
   asum
    [  flag' VCC $ mconcat [long "constitutional-committee-member", Opt.help "Member of the constiutional committee"]
-   ,  flag' VDR $ mconcat [long "drep", Opt.help "Delegate representative"]
+   ,  flag' VDR $ mconcat [long "drep", Opt.help "Delegated representative"]
    ,  flag' VSP $ mconcat [long "spo", Opt.help "Stake pool operator"]
    ]
 

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs
@@ -56,7 +56,7 @@ pGovernanceDRepKeyGenCmd era = do
               <$> pVerificationKeyFileOut
               <*> pSigningKeyFileOut
         )
-    $ Opt.progDesc "Generate Delegate Representative verification and signing keys."
+    $ Opt.progDesc "Generate Delegated Representative verification and signing keys."
 
 pGovernanceDRepKeyIdCmd :: ()
   => CardanoEra era

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs
@@ -396,7 +396,7 @@ delegatesREADME = Text.intercalate "\n"
 
 drepsREADME :: Text.Text
 drepsREADME = Text.intercalate "\n"
-  ["Keys generated by the --drep-keys flag. These keys are for Delegate Representatives (DReps) that make decisions",
+  ["Keys generated by the --drep-keys flag. These keys are for Delegated Representatives (DReps) that make decisions",
    "related to Cardano governance. Delegators that do not want to vote for each decision will pick DReps in line with",
    "their views delegate their voting power to them. The DRep's in this generated testnet data will automatically get",
    "registered and all the stake delegators (if any) will automatically delegate their vote to one of the DReps here."]

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Key.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Key.hs
@@ -84,13 +84,13 @@ ccHotVkeyDesc :: TextEnvelopeDescr
 ccHotVkeyDesc = "Constitutional Committee Hot Verification Key"
 
 drepSkeyDesc :: TextEnvelopeDescr
-drepSkeyDesc = "Delegate Representative Signing Key"
+drepSkeyDesc = "Delegated Representative Signing Key"
 
 drepExtendedSkeyDesc :: TextEnvelopeDescr
-drepExtendedSkeyDesc = "Delegate Representative Extended Signing Key"
+drepExtendedSkeyDesc = "Delegated Representative Extended Signing Key"
 
 drepVkeyDesc :: TextEnvelopeDescr
-drepVkeyDesc = "Delegate Representative Verification Key"
+drepVkeyDesc = "Delegated Representative Verification Key"
 
 genesisVkeyDesc :: TextEnvelopeDescr
 genesisVkeyDesc = "Genesis Verification Key"

diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs
@@ -50,8 +50,8 @@ hprop_golden_governanceDRepKeyGen =
     H.assertFileOccurences 1 "DRepVerificationKey_ed25519" verificationKeyFile
     H.assertFileOccurences 1 "DRepSigningKey_ed25519" signingKeyFile
 
-    H.assertFileOccurences 1 "Delegate Representative Verification Key" verificationKeyFile
-    H.assertFileOccurences 1 "Delegate Representative Signing Key" signingKeyFile
+    H.assertFileOccurences 1 "Delegated Representative Verification Key" verificationKeyFile
+    H.assertFileOccurences 1 "Delegated Representative Signing Key" signingKeyFile
 
 #ifdef UNIX
     vrfMode <- retrievePermissions verificationKeyFile

diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Key/ConvertCardanoAddressKey.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Key/ConvertCardanoAddressKey.hs
@@ -185,7 +185,7 @@ hprop_golden_convert_cardano_address_cc_drep = do
   let supplyValues =
         [ ("cc_cold.key", "--cc-cold-key", "Constitutional Committee Cold")
         , ("cc_hot.key",  "--cc-hot-key",  "Constitutional Committee Hot")
-        , ("drep.key",    "--drep-key",    "Delegate Representative")
+        , ("drep.key",    "--drep-key",    "Delegated Representative")
         ]
 
   propertyOnce $ forM_ supplyValues $ \(filename, flag, descPrefix) -> H.moduleWorkspace "tmp" $ \tempDir -> do

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -6967,7 +6967,7 @@ Usage: cardano-cli conway governance drep
 Usage: cardano-cli conway governance drep key-gen --verification-key-file FILE
                                                     --signing-key-file FILE
 
-  Generate Delegate Representative verification and signing keys.
+  Generate Delegated Representative verification and signing keys.
 
 Usage: cardano-cli conway governance drep id 
                                                ( --drep-verification-key STRING

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep.cli
@@ -13,7 +13,7 @@ Available options:
   -h,--help                Show this help text
 
 Available commands:
-  key-gen                  Generate Delegate Representative verification and
+  key-gen                  Generate Delegated Representative verification and
                            signing keys.
   id                       Generate a drep id.
   registration-certificate Create a registration certificate.

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_key-gen.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_key-gen.cli
@@ -1,7 +1,7 @@
 Usage: cardano-cli conway governance drep key-gen --verification-key-file FILE
                                                     --signing-key-file FILE
 
-  Generate Delegate Representative verification and signing keys.
+  Generate Delegated Representative verification and signing keys.
 
 Available options:
   --verification-key-file FILE

diff --git a/...ano-cli/test/cardano-cli-golden/files/golden/key/non-extended-keys/non-extended-drep.vkey b/...ano-cli/test/cardano-cli-golden/files/golden/key/non-extended-keys/non-extended-drep.vkey
@@ -1,5 +1,5 @@
 {
     "type": "DRepVerificationKey_ed25519",
-    "description": "Delegate Representative Verification Key",
+    "description": "Delegated Representative Verification Key",
     "cborHex": "5820b0cd9e6e3e274f4f38f55ef274af123cf4600ac0c58294399b7e076175262553"
 }
diff --git a/...test/cardano-cli-golden/files/golden/shelley/keys/converted_cardano-address_keys/drep.key b/...test/cardano-cli-golden/files/golden/shelley/keys/converted_cardano-address_keys/drep.key
@@ -1,5 +1,5 @@
 {
     "type": "DRepExtendedSigningKey_ed25519_bip32",
-    "description": "Delegate Representative Extended Signing Key",
+    "description": "Delegated Representative Extended Signing Key",
     "cborHex": "5880f0c207748a008785c9d5e1139a13fda9edcb3362bed0450a6b2bcb6e4bdb0541644532d1fd46e80f301ff813f0280045826dc225220aed69d28a351bdba4b1a16ff1dc22208e36cfbaca6b8d34bcbecd7d8d18dd2ca3404bba05d4f45d3060f945f8f08388e5c49e8a83e8e3b410dcc7d628e38b7b184453893d5b93521cd051"
 }
diff --git a/cardano-cli/test/cardano-cli-golden/files/input/drep.vkey b/cardano-cli/test/cardano-cli-golden/files/input/drep.vkey
@@ -1,5 +1,5 @@
 {
     "type": "DRepVerificationKey_ed25519",
-    "description": "Delegate Representative Verification Key",
+    "description": "Delegated Representative Verification Key",
     "cborHex": "58209eb6ff2ee38b24c4892a6b291ed245afa0d2fac76222e76ee3e205e3c9681540"
 }
diff --git a/cardano-cli/test/cardano-cli-golden/files/input/governance/drep/drep.vkey b/cardano-cli/test/cardano-cli-golden/files/input/governance/drep/drep.vkey
@@ -1,5 +1,5 @@
 {
     "type": "DRepVerificationKey_ed25519",
-    "description": "Delegate Representative Verification Key",
+    "description": "Delegated Representative Verification Key",
     "cborHex": "582063a24b920d31119c5b06bd7bf64941b215f2de501b3ec7d2a7e65081fb4e999c"
 }
diff --git a/...no-cli/test/cardano-cli-golden/files/input/governance/drep/extended-key-signing/drep.skey b/...no-cli/test/cardano-cli-golden/files/input/governance/drep/extended-key-signing/drep.skey
@@ -1,5 +1,5 @@
 {
   "type": "DRepExtendedSigningKey_ed25519_bip32",
-  "description": "Delegate Representative Signing Key",
+  "description": "Delegated Representative Signing Key",
   "cborHex": "588048b9578fe1a8fde546fcf5c134a7928b5213f3c2d49766becea5e3078a96354fb3ab263592401d61853957110a688cac3137649efba52994153fb6fd6b29c585b18eacea2003b68e39137545e9d42ce5bca133ca0334d6a75aa9cb1fd02be7ec90e91f5357e2c68949f0f09717c5b9809b6a74d5f87ea35383c82841f2357564"
 }
diff --git a/cardano-cli/test/cardano-cli-golden/files/input/key/non-extended-keys/extended-drep.vkey b/cardano-cli/test/cardano-cli-golden/files/input/key/non-extended-keys/extended-drep.vkey
@@ -1,5 +1,5 @@
 {
   "type": "DRepExtendedVerificationKey_ed25519_bip32",
-  "description": "Delegate Representative Verification Key",
+  "description": "Delegated Representative Verification Key",
   "cborHex": "5840b0cd9e6e3e274f4f38f55ef274af123cf4600ac0c58294399b7e076175262553dde8b75f847f2b7e61a8748627292a06d739c8ba8e78ac83e666030d1093fb3e"
 }