mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-21 14:24:09 +01:00
Code Issues Projects Releases Wiki Activity

Fix miner bug in rust client generator.

Browse source 
This commit fixes a bug in a function `gen_enum`, which
is not caught because so far we have no non-required field in enums
defined in json schema.
This commit is contained in:
joe.miyamoto 2022-04-18 13:18:17 +09:00 • committed by Rusty Russell
parent 34e93a718e
commit 562974acdb
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cln-rpc/src/model.rs
View file

@ -277,6 +277,7 @@ pub mod requests {
pub string: Option<String>,
#[serde(alias = "hex", skip_serializing_if = "Option::is_none")]
pub hex: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub mode: Option<DatastoreMode>,
#[serde(alias = "generation", skip_serializing_if = "Option::is_none")]
pub generation: Option<u64>,
@ -449,6 +450,7 @@ pub mod requests {
pub bolt11: Option<String>,
#[serde(alias = "payment_hash", skip_serializing_if = "Option::is_none")]
pub payment_hash: Option<Sha256>,
#[serde(skip_serializing_if = "Option::is_none")]
pub status: Option<ListsendpaysStatus>,
}
@ -539,6 +541,7 @@ pub mod requests {
}
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct NewaddrRequest {
#[serde(skip_serializing_if = "Option::is_none")]
pub addresstype: Option<NewaddrAddresstype>,
}
@ -741,6 +744,7 @@ pub mod requests {
}
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct ListforwardsRequest {
#[serde(skip_serializing_if = "Option::is_none")]
pub status: Option<ListforwardsStatus>,
#[serde(alias = "in_channel", skip_serializing_if = "Option::is_none")]
pub in_channel: Option<ShortChannelId>,
@ -775,6 +779,7 @@ pub mod requests {
pub bolt11: Option<String>,
#[serde(alias = "payment_hash", skip_serializing_if = "Option::is_none")]
pub payment_hash: Option<Sha256>,
#[serde(skip_serializing_if = "Option::is_none")]
pub status: Option<ListpaysStatus>,
}
@ -1934,6 +1939,7 @@ pub mod responses {
pub index: u32,
#[serde(alias = "sequence")]
pub sequence: u32,
#[serde(skip_serializing_if = "Option::is_none")]
pub item_type: Option<ListtransactionsTransactionsInputsType>,
#[serde(alias = "channel", skip_serializing_if = "Option::is_none")]
pub channel: Option<ShortChannelId>,
@ -1993,6 +1999,7 @@ pub mod responses {
pub msat: Amount,
#[serde(alias = "scriptPubKey")]
pub script_pub_key: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub item_type: Option<ListtransactionsTransactionsOutputsType>,
#[serde(alias = "channel", skip_serializing_if = "Option::is_none")]
pub channel: Option<ShortChannelId>,
@ -2599,6 +2606,7 @@ pub mod responses {
pub out_channel: Option<ShortChannelId>,
#[serde(alias = "payment_hash", skip_serializing_if = "Option::is_none")]
pub payment_hash: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub style: Option<ListforwardsForwardsStyle>,
#[serde(alias = "fee_msat", skip_serializing_if = "Option::is_none")]
pub fee_msat: Option<Amount>,

2
contrib/msggen/msggen/rust.py
View file

@ -133,7 +133,7 @@ def gen_enum(e):
defi = f" // Path `{e.path}`\n #[serde(rename = \"{e.name}\")]\n 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"
defi += f" pub {e.name.normalized()}: Option<{typename}>,\n"
return defi, decl