Remove code repetition around protocol_version CDDL in Babbage and Co…

…nway eras
IntersectMBO · Mar 8, 2024 · c9f43e4 · c9f43e4
1 parent a13e552
commit c9f43e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/eras/babbage/impl/cddl-files/babbage.cddl b/eras/babbage/impl/cddl-files/babbage.cddl
@@ -34,7 +34,7 @@ header_body =
   , block_body_size  : uint
   , block_body_hash  : $hash32 ; merkle triple root
   , operational_cert
-  , [ protocol_version ]
+  , protocol_version
   ]
 
 operational_cert =
@@ -48,7 +48,7 @@ next_major_protocol_version = 9
 
 major_protocol_version = 1..next_major_protocol_version
 
-protocol_version = (major_protocol_version, uint)
+protocol_version = [(major_protocol_version, uint)]
 
 transaction_body =
   { 0 : set<transaction_input>    ; inputs
@@ -280,7 +280,7 @@ protocol_param_update =
   , ? 9: nonnegative_interval ; pool pledge influence
   , ? 10: unit_interval       ; expansion rate
   , ? 11: unit_interval       ; treasury growth rate
-  , ? 14: [protocol_version]  ; protocol version
+  , ? 14: protocol_version    ; protocol version
   , ? 16: coin                ; min pool cost
   , ? 17: coin                ; ada per utxo byte
   , ? 18: costmdls            ; cost models for script languages

diff --git a/eras/conway/impl/cddl-files/conway.cddl b/eras/conway/impl/cddl-files/conway.cddl
@@ -34,7 +34,7 @@ header_body =
   , block_body_size  : uint
   , block_body_hash  : $hash32 ; merkle triple root
   , operational_cert
-  , [ protocol_version ]
+  , protocol_version
   ]
 
 operational_cert =
@@ -48,7 +48,7 @@ next_major_protocol_version = 10
 
 major_protocol_version = 1..next_major_protocol_version
 
-protocol_version = (major_protocol_version, uint)
+protocol_version = [(major_protocol_version, uint)]
 
 transaction_body =
   { 0 : set<transaction_input>             ; inputs
@@ -105,7 +105,7 @@ policy_hash = scripthash
 
 parameter_change_action = (0, gov_action_id / null, protocol_param_update, policy_hash / null)
 
-hard_fork_initiation_action = (1, gov_action_id / null, [protocol_version])
+hard_fork_initiation_action = (1, gov_action_id / null, protocol_version)
 
 treasury_withdrawals_action = (2, { reward_account => coin }, policy_hash / null)