Skip to content

Commit f1f9663

Browse files
arik-soarik-so
committed
Rename SignerProvider's Signer to EcdsaSigner.
1 parent 70ea110 commit f1f9663

File tree

14 files changed

+87
-87
lines changed

14 files changed

+87
-87
lines changed

‎fuzz/src/chanmon_consistency.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,14 @@ impl NodeSigner for KeyProvider {
230230
}
231231

232232
impl SignerProvider for KeyProvider {
233-
type Signer = TestChannelSigner;
233+
type EcdsaSigner = TestChannelSigner;
234234

235235
fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
236236
let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
237237
[id; 32]
238238
}
239239

240-
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
240+
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::EcdsaSigner {
241241
let secp_ctx = Secp256k1::signing_only();
242242
let id = channel_keys_id[0];
243243
let keys = InMemorySigner::new(
@@ -256,7 +256,7 @@ impl SignerProvider for KeyProvider {
256256
TestChannelSigner::new_with_revoked(keys, revoked_commitment, false)
257257
}
258258

259-
fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
259+
fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::EcdsaSigner, DecodeError> {
260260
let mut reader = std::io::Cursor::new(buffer);
261261

262262
let inner: InMemorySigner = ReadableArgs::read(&mut reader, self)?;

‎fuzz/src/full_stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,15 @@ impl NodeSigner for KeyProvider {
340340
}
341341

342342
impl SignerProvider for KeyProvider {
343-
type Signer = TestChannelSigner;
343+
type EcdsaSigner = TestChannelSigner;
344344

345345
fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
346346
let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
347347
self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
348348
[ctr; 32]
349349
}
350350

351-
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
351+
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::EcdsaSigner {
352352
let secp_ctx = Secp256k1::signing_only();
353353
let ctr = channel_keys_id[0];
354354
let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();

‎fuzz/src/onion_message.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ impl NodeSigner for KeyProvider {
189189
}
190190

191191
impl SignerProvider for KeyProvider {
192-
type Signer = TestChannelSigner;
192+
type EcdsaSigner = TestChannelSigner;
193193

194194
fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }
195195

196-
fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
196+
fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::EcdsaSigner {
197197
unreachable!()
198198
}
199199

‎lightning-background-processor/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ pub async fn process_events_async<
599599
EventHandlerFuture: core::future::Future<Output = ()>,
600600
EventHandler: Fn(Event) -> EventHandlerFuture,
601601
PS: 'static + Deref + Send,
602-
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
602+
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::EcdsaSigner, CF, T, F, L, P>> + Send + Sync,
603603
CM: 'static + Deref<Target = ChannelManager<CW, T, ES, NS, SP, F, R, L>> + Send + Sync,
604604
PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>> + Send + Sync,
605605
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
@@ -617,15 +617,15 @@ pub async fn process_events_async<
617617
where
618618
UL::Target: 'static + UtxoLookup,
619619
CF::Target: 'static + chain::Filter,
620-
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::Signer>,
620+
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
621621
T::Target: 'static + BroadcasterInterface,
622622
ES::Target: 'static + EntropySource,
623623
NS::Target: 'static + NodeSigner,
624624
SP::Target: 'static + SignerProvider,
625625
F::Target: 'static + FeeEstimator,
626626
R::Target: 'static + Router,
627627
L::Target: 'static + Logger,
628-
P::Target: 'static + Persist<<SP::Target as SignerProvider>::Signer>,
628+
P::Target: 'static + Persist<<SP::Target as SignerProvider>::EcdsaSigner>,
629629
PS::Target: 'static + Persister<'a, CW, T, ES, NS, SP, F, R, L, SC>,
630630
{
631631
let mut should_break = false;
@@ -738,7 +738,7 @@ impl BackgroundProcessor {
738738
P: 'static + Deref + Send + Sync,
739739
EH: 'static + EventHandler + Send,
740740
PS: 'static + Deref + Send,
741-
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
741+
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::EcdsaSigner, CF, T, F, L, P>> + Send + Sync,
742742
CM: 'static + Deref<Target = ChannelManager<CW, T, ES, NS, SP, F, R, L>> + Send + Sync,
743743
PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>> + Send + Sync,
744744
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
@@ -753,15 +753,15 @@ impl BackgroundProcessor {
753753
where
754754
UL::Target: 'static + UtxoLookup,
755755
CF::Target: 'static + chain::Filter,
756-
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::Signer>,
756+
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
757757
T::Target: 'static + BroadcasterInterface,
758758
ES::Target: 'static + EntropySource,
759759
NS::Target: 'static + NodeSigner,
760760
SP::Target: 'static + SignerProvider,
761761
F::Target: 'static + FeeEstimator,
762762
R::Target: 'static + Router,
763763
L::Target: 'static + Logger,
764-
P::Target: 'static + Persist<<SP::Target as SignerProvider>::Signer>,
764+
P::Target: 'static + Persist<<SP::Target as SignerProvider>::EcdsaSigner>,
765765
PS::Target: 'static + Persister<'a, CW, T, ES, NS, SP, F, R, L, SC>,
766766
{
767767
let stop_thread = Arc::new(AtomicBool::new(false));

‎lightning-block-sync/src/init.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
6969
/// R: Router,
7070
/// L: Logger,
7171
/// C: chain::Filter,
72-
/// P: chainmonitor::Persist<SP::Signer>,
72+
/// P: chainmonitor::Persist<SP::EcdsaSigner>,
7373
/// >(
7474
/// block_source: &B,
75-
/// chain_monitor: &ChainMonitor<SP::Signer, &C, &T, &F, &L, &P>,
75+
/// chain_monitor: &ChainMonitor<SP::EcdsaSigner, &C, &T, &F, &L, &P>,
7676
/// config: UserConfig,
7777
/// entropy_source: &ES,
7878
/// node_signer: &NS,
@@ -85,7 +85,7 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
8585
/// ) {
8686
/// // Read a serialized channel monitor paired with the block hash when it was persisted.
8787
/// let serialized_monitor = "...";
88-
/// let (monitor_block_hash, mut monitor) = <(BlockHash, ChannelMonitor<SP::Signer>)>::read(
88+
/// let (monitor_block_hash, mut monitor) = <(BlockHash, ChannelMonitor<SP::EcdsaSigner>)>::read(
8989
/// &mut Cursor::new(&serialized_monitor), (entropy_source, signer_provider)).unwrap();
9090
///
9191
/// // Read the channel manager paired with the block hash when it was persisted.
@@ -103,7 +103,7 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
103103
/// config,
104104
/// vec![&mut monitor],
105105
/// );
106-
/// <(BlockHash, ChannelManager<&ChainMonitor<SP::Signer, &C, &T, &F, &L, &P>, &T, &ES, &NS, &SP, &F, &R, &L>)>::read(
106+
/// <(BlockHash, ChannelManager<&ChainMonitor<SP::EcdsaSigner, &C, &T, &F, &L, &P>, &T, &ES, &NS, &SP, &F, &R, &L>)>::read(
107107
/// &mut Cursor::new(&serialized_manager), read_args).unwrap()
108108
/// };
109109
///

‎lightning-invoice/src/utils.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ pub fn create_invoice_from_channelmanager<M: Deref, T: Deref, ES: Deref, NS: Der
335335
min_final_cltv_expiry_delta: Option<u16>,
336336
) -> Result<Bolt11Invoice, SignOrCreationError<()>>
337337
where
338-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
338+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
339339
T::Target: BroadcasterInterface,
340340
ES::Target: EntropySource,
341341
NS::Target: NodeSigner,
@@ -376,7 +376,7 @@ pub fn create_invoice_from_channelmanager_with_description_hash<M: Deref, T: Der
376376
invoice_expiry_delta_secs: u32, min_final_cltv_expiry_delta: Option<u16>,
377377
) -> Result<Bolt11Invoice, SignOrCreationError<()>>
378378
where
379-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
379+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
380380
T::Target: BroadcasterInterface,
381381
ES::Target: EntropySource,
382382
NS::Target: NodeSigner,
@@ -406,7 +406,7 @@ pub fn create_invoice_from_channelmanager_with_description_hash_and_duration_sin
406406
duration_since_epoch: Duration, invoice_expiry_delta_secs: u32, min_final_cltv_expiry_delta: Option<u16>,
407407
) -> Result<Bolt11Invoice, SignOrCreationError<()>>
408408
where
409-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
409+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
410410
T::Target: BroadcasterInterface,
411411
ES::Target: EntropySource,
412412
NS::Target: NodeSigner,
@@ -431,7 +431,7 @@ pub fn create_invoice_from_channelmanager_and_duration_since_epoch<M: Deref, T:
431431
invoice_expiry_delta_secs: u32, min_final_cltv_expiry_delta: Option<u16>,
432432
) -> Result<Bolt11Invoice, SignOrCreationError<()>>
433433
where
434-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
434+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
435435
T::Target: BroadcasterInterface,
436436
ES::Target: EntropySource,
437437
NS::Target: NodeSigner,
@@ -455,7 +455,7 @@ fn _create_invoice_from_channelmanager_and_duration_since_epoch<M: Deref, T: Der
455455
duration_since_epoch: Duration, invoice_expiry_delta_secs: u32, min_final_cltv_expiry_delta: Option<u16>,
456456
) -> Result<Bolt11Invoice, SignOrCreationError<()>>
457457
where
458-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
458+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
459459
T::Target: BroadcasterInterface,
460460
ES::Target: EntropySource,
461461
NS::Target: NodeSigner,
@@ -488,7 +488,7 @@ pub fn create_invoice_from_channelmanager_and_duration_since_epoch_with_payment_
488488
invoice_expiry_delta_secs: u32, payment_hash: PaymentHash, min_final_cltv_expiry_delta: Option<u16>,
489489
) -> Result<Bolt11Invoice, SignOrCreationError<()>>
490490
where
491-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
491+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
492492
T::Target: BroadcasterInterface,
493493
ES::Target: EntropySource,
494494
NS::Target: NodeSigner,
@@ -518,7 +518,7 @@ fn _create_invoice_from_channelmanager_and_duration_since_epoch_with_payment_has
518518
payment_secret: PaymentSecret, min_final_cltv_expiry_delta: Option<u16>,
519519
) -> Result<Bolt11Invoice, SignOrCreationError<()>>
520520
where
521-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
521+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
522522
T::Target: BroadcasterInterface,
523523
ES::Target: EntropySource,
524524
NS::Target: NodeSigner,

‎lightning/src/chain/channelmonitor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4179,7 +4179,7 @@ where
41794179
const MAX_ALLOC_SIZE: usize = 64*1024;
41804180

41814181
impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP)>
4182-
for (BlockHash, ChannelMonitor<SP::Signer>) {
4182+
for (BlockHash, ChannelMonitor<SP::EcdsaSigner>) {
41834183
fn read<R: io::Read>(reader: &mut R, args: (&'a ES, &'b SP)) -> Result<Self, DecodeError> {
41844184
macro_rules! unwrap_obj {
41854185
($key: expr) => {
@@ -4365,7 +4365,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
43654365
return Err(DecodeError::InvalidValue);
43664366
}
43674367
}
4368-
let onchain_tx_handler: OnchainTxHandler<SP::Signer> = ReadableArgs::read(
4368+
let onchain_tx_handler: OnchainTxHandler<SP::EcdsaSigner> = ReadableArgs::read(
43694369
reader, (entropy_source, signer_provider, channel_value_satoshis, channel_keys_id)
43704370
)?;
43714371

‎lightning/src/chain/onchaintx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
339339
}
340340
}
341341

342-
impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP, u64, [u8; 32])> for OnchainTxHandler<SP::Signer> {
342+
impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP, u64, [u8; 32])> for OnchainTxHandler<SP::EcdsaSigner> {
343343
fn read<R: io::Read>(reader: &mut R, args: (&'a ES, &'b SP, u64, [u8; 32])) -> Result<Self, DecodeError> {
344344
let entropy_source = args.0;
345345
let signer_provider = args.1;

‎lightning/src/events/bump_transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl AnchorDescriptor {
9292
/// Derives the channel signer required to sign the anchor input.
9393
pub fn derive_channel_signer<S: WriteableEcdsaChannelSigner, SP: Deref>(&self, signer_provider: &SP) -> S
9494
where
95-
SP::Target: SignerProvider<Signer = S>
95+
SP::Target: SignerProvider<EcdsaSigner= S>
9696
{
9797
let mut signer = signer_provider.derive_channel_signer(
9898
self.channel_derivation_parameters.value_satoshis,

‎lightning/src/ln/channel.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ pub(super) enum ChannelPhase<SP: Deref> where SP::Target: SignerProvider {
645645

646646
impl<'a, SP: Deref> ChannelPhase<SP> where
647647
SP::Target: SignerProvider,
648-
<SP::Target as SignerProvider>::Signer: ChannelSigner,
648+
<SP::Target as SignerProvider>::EcdsaSigner: ChannelSigner,
649649
{
650650
pub fn context(&'a self) -> &'a ChannelContext<SP> {
651651
match self {
@@ -723,7 +723,7 @@ pub(super) struct ChannelContext<SP: Deref> where SP::Target: SignerProvider {
723723

724724
latest_monitor_update_id: u64,
725725

726-
holder_signer: ChannelSignerType<<SP::Target as SignerProvider>::Signer>,
726+
holder_signer: ChannelSignerType<<SP::Target as SignerProvider>::EcdsaSigner>,
727727
shutdown_scriptpubkey: Option<ShutdownScript>,
728728
destination_script: ScriptBuf,
729729

@@ -1093,7 +1093,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
10931093

10941094
/// Returns the holder signer for this channel.
10951095
#[cfg(test)]
1096-
pub fn get_signer(&self) -> &ChannelSignerType<<SP::Target as SignerProvider>::Signer> {
1096+
pub fn get_signer(&self) -> &ChannelSignerType<<SP::Target as SignerProvider>::EcdsaSigner> {
10971097
return &self.holder_signer
10981098
}
10991099

@@ -2261,7 +2261,7 @@ struct CommitmentTxInfoCached {
22612261

22622262
impl<SP: Deref> Channel<SP> where
22632263
SP::Target: SignerProvider,
2264-
<SP::Target as SignerProvider>::Signer: WriteableEcdsaChannelSigner
2264+
<SP::Target as SignerProvider>::EcdsaSigner: WriteableEcdsaChannelSigner
22652265
{
22662266
fn check_remote_fee<F: Deref, L: Deref>(
22672267
channel_type: &ChannelTypeFeatures, fee_estimator: &LowerBoundedFeeEstimator<F>,
@@ -2657,7 +2657,7 @@ impl<SP: Deref> Channel<SP> where
26572657
/// If this call is successful, broadcast the funding transaction (and not before!)
26582658
pub fn funding_signed<L: Deref>(
26592659
&mut self, msg: &msgs::FundingSigned, best_block: BestBlock, signer_provider: &SP, logger: &L
2660-
) -> Result<ChannelMonitor<<SP::Target as SignerProvider>::Signer>, ChannelError>
2660+
) -> Result<ChannelMonitor<<SP::Target as SignerProvider>::EcdsaSigner>, ChannelError>
26612661
where
26622662
L::Target: Logger
26632663
{
@@ -4789,7 +4789,7 @@ impl<SP: Deref> Channel<SP> where
47894789
}
47904790

47914791
#[cfg(test)]
4792-
pub fn get_signer(&self) -> &ChannelSignerType<<SP::Target as SignerProvider>::Signer> {
4792+
pub fn get_signer(&self) -> &ChannelSignerType<<SP::Target as SignerProvider>::EcdsaSigner> {
47934793
&self.context.holder_signer
47944794
}
47954795

@@ -6810,7 +6810,7 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
68106810

68116811
pub fn funding_created<L: Deref>(
68126812
mut self, msg: &msgs::FundingCreated, best_block: BestBlock, signer_provider: &SP, logger: &L
6813-
) -> Result<(Channel<SP>, Option<msgs::FundingSigned>, ChannelMonitor<<SP::Target as SignerProvider>::Signer>), (Self, ChannelError)>
6813+
) -> Result<(Channel<SP>, Option<msgs::FundingSigned>, ChannelMonitor<<SP::Target as SignerProvider>::EcdsaSigner>), (Self, ChannelError)>
68146814
where
68156815
L::Target: Logger
68166816
{
@@ -7850,17 +7850,17 @@ mod tests {
78507850
}
78517851

78527852
impl SignerProvider for Keys {
7853-
type Signer = InMemorySigner;
7853+
type EcdsaSigner = InMemorySigner;
78547854

78557855
fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
78567856
self.signer.channel_keys_id()
78577857
}
78587858

7859-
fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
7859+
fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::EcdsaSigner {
78607860
self.signer.clone()
78617861
}
78627862

7863-
fn read_chan_signer(&self, _data: &[u8]) -> Result<Self::Signer, DecodeError> { panic!(); }
7863+
fn read_chan_signer(&self, _data: &[u8]) -> Result<Self::EcdsaSigner, DecodeError> { panic!(); }
78647864

78657865
fn get_destination_script(&self) -> Result<ScriptBuf, ()> {
78667866
let secp_ctx = Secp256k1::signing_only();

0 commit comments

Comments
 (0)