Skip to content

schemas: use sat and sat_or_all again where appropiate #7336

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.

Sign up for GitHub

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

Merged
endothermicdev merged 2 commits into from
May 28, 2024
Merged

schemas: use sat and sat_or_all again where appropiate #7336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f0c9c3
schemas: use sat and sat_or_all again where appropiate
daywalker90 May 24, 2024
1727e75
docs: Type change for request amount too
ShahanaFarooqui May 24, 2024
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
60 changes: 30 additions & 30 deletions cln-grpc/src/convert.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions contrib/msggen/msggen/gen/grpc/convert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ def generate_composite(self, prefix, field: CompositeField, override=None):
"u16?": f"c.{name}.map(|v| v.into())",
"msat": f"Some(c.{name}.into())",
"msat?": f"c.{name}.map(|f| f.into())",
"sat": f"Some(c.{name}.into())",
"sat?": f"c.{name}.map(|f| f.into())",
"pubkey": f"c.{name}.serialize().to_vec()",
"pubkey?": f"c.{name}.map(|v| v.serialize().to_vec())",
"hex": f"hex::decode(&c.{name}).unwrap()",
Expand All @@ -115,6 +117,8 @@ def generate_composite(self, prefix, field: CompositeField, override=None):
"msat_or_any": f"Some(c.{name}.into())",
"msat_or_all": f"Some(c.{name}.into())",
"msat_or_all?": f"c.{name}.map(|o|o.into())",
"sat_or_all": f"Some(c.{name}.into())",
"sat_or_all?": f"c.{name}.map(|o|o.into())",
"feerate?": f"c.{name}.map(|o|o.into())",
"feerate": f"Some(c.{name}.into())",
"outpoint?": f"c.{name}.map(|o|o.into())",
Expand Down
4 changes: 4 additions & 0 deletions contrib/msggen/msggen/gen/grpc/unconvert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ def generate_composite(self, prefix, field: CompositeField, override=None) -> No
"msat_or_all?": f"c.{name}.map(|a| a.into())",
"msat_or_any": f"c.{name}.unwrap().into()",
"msat_or_any?": f"c.{name}.map(|a| a.into())",
"sat": f"c.{name}.unwrap().into()",
"sat?": f"c.{name}.map(|a| a.into())",
"sat_or_all": f"c.{name}.unwrap().into()",
"sat_or_all?": f"c.{name}.map(|a| a.into())",
"feerate": f"c.{name}.unwrap().into()",
"feerate?": f"c.{name}.map(|a| a.into())",
"outpoint?": f"c.{name}.map(|a| a.into())",
Expand Down
2 changes: 2 additions & 0 deletions contrib/msggen/msggen/gen/grpc/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"msat": "Amount",
"msat_or_all": "AmountOrAll",
"msat_or_any": "AmountOrAny",
"sat": "Amount",
"sat_or_all": "AmountOrAll",
"currency": "string",
"number": "double",
"pubkey": "bytes",
Expand Down
5 changes: 5 additions & 0 deletions contrib/msggen/msggen/gen/grpc2py.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def __init__(self, dest: TextIO):
"boolean": "m.{name}",
"short_channel_id": "m.{name}",
"msat": "amount2msat(m.{name})",
"sat": "amount2sat(m.{name})",
"currency": "m.{name}",
"number": "m.{name}",
}
Expand Down Expand Up @@ -87,6 +88,10 @@ def amount2msat(a):
return a.msat


def amount2sat(a):
return a.msat / 1000

@endothermicdev endothermicdev May 24, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return a.msat / 1000
return a.msat // 1000

Do we want integer division here? Any remainder after division should indicate a problem, but if we're only using it to directly convert types it shouldn't theoretically be an issue.

@daywalker90 daywalker90 May 25, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assumed an Amount already is a correctly parsed value and this should be fine, otherwise we should raise an error here, no?



def remove_default(d):
# grpc is really not good at empty values, they get replaced with the type's default value...
return {k: v for k, v in d.items() if v is not None and v != ""}
Expand Down
2 changes: 2 additions & 0 deletions contrib/msggen/msggen/gen/rpc/rust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
"msat": "Amount",
"msat_or_all": "AmountOrAll",
"msat_or_any": "AmountOrAny",
"sat": "Amount",
"sat_or_all": "AmountOrAll",
"currency": "String",
"number": "f64",
"pubkey": "PublicKey",
Expand Down
2 changes: 2 additions & 0 deletions contrib/msggen/msggen/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,8 @@ class PrimitiveField(Field):
"msat",
"msat_or_any",
"msat_or_all",
"sat",
"sat_or_all",
"currency",
"hex",
"short_channel_id",
Expand Down
Loading