Accept relayChain and paraId as alternative spellings (#2366)

* Accept relayChain and paraId as alternative spellings * brings -> increases Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
paritytech · Jun 9, 2022 · ce5a66c · ce5a66c
1 parent ed966fa
commit ce5a66c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/bin/wasm-node/CHANGELOG.md b/bin/wasm-node/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Added
+
+- The `relay_chain` and `para_id` fields in chain specifications can now alternatively be named respectively `relayChain` and `paraId`. This increases consistency with the other fields of chain specifications, which are all camelCase.
+
 ### Fixed
 
 - Fix another panic in case of a carefully-crafted LEB128 length. ([#2337](https://github.com/paritytech/smoldot/pull/2337))

diff --git a/src/chain_spec/structs.rs b/src/chain_spec/structs.rs
@@ -68,7 +68,14 @@ pub(super) struct ClientSpec {
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(deny_unknown_fields)]
 pub(super) struct ChainSpecParachain {
+    // Note that in Substrate/Cumulus this field is only named `relay_chain` and `relayChain` is
+    // not accepted (as of 2022-06-09). This seems to be an oversight, as there are only two
+    // fields that use snake_case while the rest uses camelCase. For this reason, smoldot
+    // supports both.
+    #[serde(alias = "relayChain")]
     pub(super) relay_chain: String,
+    // Same remark concerning the name as `relay_chain`
+    #[serde(alias = "paraId")]
     pub(super) para_id: u32,
 }