mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-19 05:44:12 +01:00
Code Issues Projects Releases Wiki Activity

cln-rpc: use serde rename instead of alias

Browse Source 
rename is necessary to roundtrip, otherwise the rust name is used.

This also remove the rename if they are not necessary.

Note that:
```
 #[serde(rename="foo", skip_serializing_if=="bar")]
 pub field: bool,
```

is equivalent to:
```
 #[serde(rename="foo")]
 #[serde(skip_serializing_if=="bar")]
 pub field: bool,
```

and for simplicity of construction the latter is used
This commit is contained in:
Riccardo Casatta 2023-01-17 15:14:15 +01:00 committed by Christian Decker
parent fa4b61d13d
commit 182a9cdcb6
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cln-rpc/src/model.rs
View File

Binary file not shown.

25
contrib/msggen/msggen/gen/rust.py
View File

@ -133,7 +133,9 @@ def gen_enum(e):
typename = overrides[e.path]
if e.required:
defi = f" // Path `{e.path}`\n #[serde(rename = \"{e.name}\")]\n pub {e.name.normalized()}: {typename},\n"
defi = f" // Path `{e.path}`\n"
defi += rename_if_necessary(str(e.name), e.name.normalized())
defi += f" pub {e.name.normalized()}: {typename},\n"
else:
defi = f' #[serde(skip_serializing_if = "Option::is_none")]\n'
defi += f" pub {e.name.normalized()}: Option<{typename}>,\n"
@ -149,14 +151,22 @@ def gen_primitive(p):
if p.deprecated:
defi += " #[deprecated]\n"
defi += rename_if_necessary(org, p.name.name)
if p.required:
defi += f" #[serde(alias = \"{org}\")]\n pub {p.name}: {typename},\n"
defi += f" pub {p.name}: {typename},\n"
else:
defi += f" #[serde(alias = \"{org}\", skip_serializing_if = \"Option::is_none\")]\n pub {p.name}: Option<{typename}>,\n"
defi += f" #[serde(skip_serializing_if = \"Option::is_none\")]\n pub {p.name}: Option<{typename}>,\n"
return defi, decl
def rename_if_necessary(original, name):
if original != name:
return f" #[serde(rename = \"{original}\")]\n"
else:
return f""
def gen_array(a):
name = a.name.normalized().replace("[]", "")
logger.debug(f"Generating array field {a.name} -> {name} ({a.path})")
@ -180,10 +190,11 @@ def gen_array(a):
defi = ""
if a.deprecated:
defi += " #[deprecated]\n"
defi += rename_if_necessary(alias, name)
if a.required:
defi += f" #[serde(alias = \"{alias}\")]\n pub {name}: {'Vec<'*a.dims}{itemtype}{'>'*a.dims},\n"
defi += f" pub {name}: {'Vec<'*a.dims}{itemtype}{'>'*a.dims},\n"
else:
defi += f" #[serde(alias = \"{alias}\", skip_serializing_if = \"crate::is_none_or_empty\")]\n pub {name}: Option<{'Vec<'*a.dims}{itemtype}{'>'*a.dims}>,\n"
defi += f" #[serde(skip_serializing_if = \"crate::is_none_or_empty\")]\n pub {name}: Option<{'Vec<'*a.dims}{itemtype}{'>'*a.dims}>,\n"
return (defi, decl)
@ -206,9 +217,9 @@ def gen_composite(c) -> Tuple[str, str]:
if c.deprecated:
defi += " #[deprecated]\n"
if c.required:
defi += f" #[serde(alias = \"{c.name.name}\")]\n pub {c.name}: {c.typename},\n"
defi += f" pub {c.name}: {c.typename},\n"
else:
defi += f" #[serde(alias = \"{c.name.name}\", skip_serializing_if = \"Option::is_none\")]\n pub {c.name}: Option<{c.typename}>,\n"
defi += f" #[serde(skip_serializing_if = \"Option::is_none\")]\n pub {c.name}: Option<{c.typename}>,\n"
return defi, r