From 43f4e12cde692540f2c0e0216f7a6dca9b07a3c2 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Fri, 24 May 2024 12:24:35 -0700 Subject: [PATCH] docs: Type change for request amount too For multifund and openchannel_init schemas, request_amt type is also `sat`. --- cln-grpc/src/convert.rs | 12 ++++++------ contrib/msggen/msggen/schema.json | 6 +++--- doc/schemas/lightning-fundchannel.json | 2 +- doc/schemas/lightning-multifundchannel.json | 2 +- doc/schemas/lightning-openchannel_init.json | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cln-grpc/src/convert.rs b/cln-grpc/src/convert.rs index 2e36be3f1314..10561f1229be 100644 --- a/cln-grpc/src/convert.rs +++ b/cln-grpc/src/convert.rs @@ -4707,7 +4707,7 @@ impl From for pb::FundchannelRequest { minconf: c.minconf, // Rule #2 for type u32? mindepth: c.mindepth, // Rule #2 for type u32? push_msat: c.push_msat.map(|f| f.into()), // Rule #2 for type msat? - request_amt: c.request_amt.map(|f| f.into()), // Rule #2 for type msat? + request_amt: c.request_amt.map(|f| f.into()), // Rule #2 for type sat? reserve: c.reserve.map(|f| f.into()), // Rule #2 for type sat? // Field: FundChannel.utxos[] utxos: c.utxos.map(|arr| arr.into_iter().map(|i| i.into()).collect()).unwrap_or(vec![]), // Rule #3 @@ -4838,7 +4838,7 @@ impl From for pb::MultifundchannelDestin id: c.id, // Rule #2 for type string mindepth: c.mindepth, // Rule #2 for type u32? push_msat: c.push_msat.map(|f| f.into()), // Rule #2 for type msat? - request_amt: c.request_amt.map(|f| f.into()), // Rule #2 for type msat? + request_amt: c.request_amt.map(|f| f.into()), // Rule #2 for type sat? reserve: c.reserve.map(|f| f.into()), // Rule #2 for type sat? } } @@ -4928,7 +4928,7 @@ impl From for pb::OpenchannelInitRequest { funding_feerate: c.funding_feerate.map(|o|o.into()), // Rule #2 for type feerate? id: c.id.serialize().to_vec(), // Rule #2 for type pubkey initialpsbt: c.initialpsbt, // Rule #2 for type string - request_amt: c.request_amt.map(|f| f.into()), // Rule #2 for type msat? + request_amt: c.request_amt.map(|f| f.into()), // Rule #2 for type sat? } } } @@ -6114,7 +6114,7 @@ impl From for requests::FundchannelRequest { minconf: c.minconf, // Rule #1 for type u32? mindepth: c.mindepth, // Rule #1 for type u32? push_msat: c.push_msat.map(|a| a.into()), // Rule #1 for type msat? - request_amt: c.request_amt.map(|a| a.into()), // Rule #1 for type msat? + request_amt: c.request_amt.map(|a| a.into()), // Rule #1 for type sat? reserve: c.reserve.map(|a| a.into()), // Rule #1 for type sat? utxos: Some(c.utxos.into_iter().map(|s| s.into()).collect()), // Rule #4 } @@ -6242,7 +6242,7 @@ impl From for requests::MultifundchannelDestin id: c.id, // Rule #1 for type string mindepth: c.mindepth, // Rule #1 for type u32? push_msat: c.push_msat.map(|a| a.into()), // Rule #1 for type msat? - request_amt: c.request_amt.map(|a| a.into()), // Rule #1 for type msat? + request_amt: c.request_amt.map(|a| a.into()), // Rule #1 for type sat? reserve: c.reserve.map(|a| a.into()), // Rule #1 for type sat? } } @@ -6327,7 +6327,7 @@ impl From for requests::Openchannel_initRequest { funding_feerate: c.funding_feerate.map(|a| a.into()), // Rule #1 for type feerate? id: PublicKey::from_slice(&c.id).unwrap(), // Rule #1 for type pubkey initialpsbt: c.initialpsbt, // Rule #1 for type string - request_amt: c.request_amt.map(|a| a.into()), // Rule #1 for type msat? + request_amt: c.request_amt.map(|a| a.into()), // Rule #1 for type sat? } } } diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json index 3a2f4bdcb219..c7b92b474229 100644 --- a/contrib/msggen/msggen/schema.json +++ b/contrib/msggen/msggen/schema.json @@ -10086,7 +10086,7 @@ ] }, "request_amt": { - "type": "msat", + "type": "sat", "description": [ "An amount of liquidity you'd like to lease from the peer. If peer supports `option_will_fund`, indicates to them to include this much liquidity into the channel. Must also pass in *compact_lease*." ] @@ -22296,7 +22296,7 @@ ] }, "request_amt": { - "type": "msat", + "type": "sat", "description": [ "Amount of liquidity you'd like to lease from peer. If peer supports `option_will_fund`, indicates to them to include this much liquidity into the channel. Must also pass in *compact_lease*." ] @@ -23583,7 +23583,7 @@ ] }, "request_amt": { - "type": "msat", + "type": "sat", "description": [ "An amount of liquidity you'd like to lease from the peer. If peer supports `option_will_fund`, indicates to them to include this much liquidity into the channel. Must also pass in *compact_lease*." ] diff --git a/doc/schemas/lightning-fundchannel.json b/doc/schemas/lightning-fundchannel.json index 17c171413d07..478734f048e5 100644 --- a/doc/schemas/lightning-fundchannel.json +++ b/doc/schemas/lightning-fundchannel.json @@ -65,7 +65,7 @@ ] }, "request_amt": { - "type": "msat", + "type": "sat", "description": [ "An amount of liquidity you'd like to lease from the peer. If peer supports `option_will_fund`, indicates to them to include this much liquidity into the channel. Must also pass in *compact_lease*." ] diff --git a/doc/schemas/lightning-multifundchannel.json b/doc/schemas/lightning-multifundchannel.json index 9e2419bddaa7..ba4e89b4a803 100644 --- a/doc/schemas/lightning-multifundchannel.json +++ b/doc/schemas/lightning-multifundchannel.json @@ -61,7 +61,7 @@ ] }, "request_amt": { - "type": "msat", + "type": "sat", "description": [ "Amount of liquidity you'd like to lease from peer. If peer supports `option_will_fund`, indicates to them to include this much liquidity into the channel. Must also pass in *compact_lease*." ] diff --git a/doc/schemas/lightning-openchannel_init.json b/doc/schemas/lightning-openchannel_init.json index 8ab72791ea81..1fd5a5cac43e 100644 --- a/doc/schemas/lightning-openchannel_init.json +++ b/doc/schemas/lightning-openchannel_init.json @@ -58,7 +58,7 @@ ] }, "request_amt": { - "type": "msat", + "type": "sat", "description": [ "An amount of liquidity you'd like to lease from the peer. If peer supports `option_will_fund`, indicates to them to include this much liquidity into the channel. Must also pass in *compact_lease*." ]