Skip to content

Commit 5e87b8f

Browse files
arik-soarik-so
committed
Rename SignerProvider's Signer to EcdsaSigner.
1 parent 4507e43 commit 5e87b8f

File tree

16 files changed

+81
-81
lines changed

16 files changed

+81
-81
lines changed

‎fuzz/src/chanmon_consistency.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,14 @@ impl NodeSigner for KeyProvider {
234234
}
235235

236236
impl SignerProvider for KeyProvider {
237-
type Signer = EnforcingSigner;
237+
type EcdsaSigner = EnforcingSigner;
238238

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

244-
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
244+
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::EcdsaSigner {
245245
let secp_ctx = Secp256k1::signing_only();
246246
let id = channel_keys_id[0];
247247
let keys = InMemorySigner::new(
@@ -260,7 +260,7 @@ impl SignerProvider for KeyProvider {
260260
EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
261261
}
262262

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

266266
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
@@ -339,15 +339,15 @@ impl NodeSigner for KeyProvider {
339339
}
340340

341341
impl SignerProvider for KeyProvider {
342-
type Signer = EnforcingSigner;
342+
type EcdsaSigner = EnforcingSigner;
343343

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

350-
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
350+
fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::EcdsaSigner {
351351
let secp_ctx = Secp256k1::signing_only();
352352
let ctr = channel_keys_id[0];
353353
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
@@ -174,11 +174,11 @@ impl NodeSigner for KeyProvider {
174174
}
175175

176176
impl SignerProvider for KeyProvider {
177-
type Signer = EnforcingSigner;
177+
type EcdsaSigner = EnforcingSigner;
178178

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

181-
fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
181+
fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::EcdsaSigner {
182182
unreachable!()
183183
}
184184

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ pub async fn process_events_async<
591591
EventHandlerFuture: core::future::Future<Output = ()>,
592592
EventHandler: Fn(Event) -> EventHandlerFuture,
593593
PS: 'static + Deref + Send,
594-
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
594+
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::EcdsaSigner, CF, T, F, L, P>> + Send + Sync,
595595
CM: 'static + Deref<Target = ChannelManager<CW, T, ES, NS, SP, F, R, L>> + Send + Sync,
596596
PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>> + Send + Sync,
597597
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
@@ -609,15 +609,15 @@ pub async fn process_events_async<
609609
where
610610
UL::Target: 'static + UtxoLookup,
611611
CF::Target: 'static + chain::Filter,
612-
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::Signer>,
612+
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
613613
T::Target: 'static + BroadcasterInterface,
614614
ES::Target: 'static + EntropySource,
615615
NS::Target: 'static + NodeSigner,
616616
SP::Target: 'static + SignerProvider,
617617
F::Target: 'static + FeeEstimator,
618618
R::Target: 'static + Router,
619619
L::Target: 'static + Logger,
620-
P::Target: 'static + Persist<<SP::Target as SignerProvider>::Signer>,
620+
P::Target: 'static + Persist<<SP::Target as SignerProvider>::EcdsaSigner>,
621621
PS::Target: 'static + Persister<'a, CW, T, ES, NS, SP, F, R, L, SC>,
622622
{
623623
let mut should_break = false;
@@ -732,7 +732,7 @@ impl BackgroundProcessor {
732732
P: 'static + Deref + Send + Sync,
733733
EH: 'static + EventHandler + Send,
734734
PS: 'static + Deref + Send,
735-
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
735+
M: 'static + Deref<Target = ChainMonitor<<SP::Target as SignerProvider>::EcdsaSigner, CF, T, F, L, P>> + Send + Sync,
736736
CM: 'static + Deref<Target = ChannelManager<CW, T, ES, NS, SP, F, R, L>> + Send + Sync,
737737
PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>> + Send + Sync,
738738
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
@@ -747,15 +747,15 @@ impl BackgroundProcessor {
747747
where
748748
UL::Target: 'static + UtxoLookup,
749749
CF::Target: 'static + chain::Filter,
750-
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::Signer>,
750+
CW::Target: 'static + chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
751751
T::Target: 'static + BroadcasterInterface,
752752
ES::Target: 'static + EntropySource,
753753
NS::Target: 'static + NodeSigner,
754754
SP::Target: 'static + SignerProvider,
755755
F::Target: 'static + FeeEstimator,
756756
R::Target: 'static + Router,
757757
L::Target: 'static + Logger,
758-
P::Target: 'static + Persist<<SP::Target as SignerProvider>::Signer>,
758+
P::Target: 'static + Persist<<SP::Target as SignerProvider>::EcdsaSigner>,
759759
PS::Target: 'static + Persister<'a, CW, T, ES, NS, SP, F, R, L, SC>,
760760
{
761761
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/payment.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn pay_invoice<M: Deref, T: Deref, ES: Deref, NS: Deref, SP: Deref, F: Deref
3737
channelmanager: &ChannelManager<M, T, ES, NS, SP, F, R, L>
3838
) -> Result<PaymentId, PaymentError>
3939
where
40-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
40+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
4141
T::Target: BroadcasterInterface,
4242
ES::Target: EntropySource,
4343
NS::Target: NodeSigner,
@@ -66,7 +66,7 @@ pub fn pay_invoice_with_id<M: Deref, T: Deref, ES: Deref, NS: Deref, SP: Deref,
6666
channelmanager: &ChannelManager<M, T, ES, NS, SP, F, R, L>
6767
) -> Result<(), PaymentError>
6868
where
69-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
69+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
7070
T::Target: BroadcasterInterface,
7171
ES::Target: EntropySource,
7272
NS::Target: NodeSigner,
@@ -93,7 +93,7 @@ pub fn pay_zero_value_invoice<M: Deref, T: Deref, ES: Deref, NS: Deref, SP: Dere
9393
channelmanager: &ChannelManager<M, T, ES, NS, SP, F, R, L>
9494
) -> Result<PaymentId, PaymentError>
9595
where
96-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
96+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
9797
T::Target: BroadcasterInterface,
9898
ES::Target: EntropySource,
9999
NS::Target: NodeSigner,
@@ -124,7 +124,7 @@ pub fn pay_zero_value_invoice_with_id<M: Deref, T: Deref, ES: Deref, NS: Deref,
124124
channelmanager: &ChannelManager<M, T, ES, NS, SP, F, R, L>
125125
) -> Result<(), PaymentError>
126126
where
127-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
127+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
128128
T::Target: BroadcasterInterface,
129129
ES::Target: EntropySource,
130130
NS::Target: NodeSigner,
@@ -191,7 +191,7 @@ trait Payer {
191191

192192
impl<M: Deref, T: Deref, ES: Deref, NS: Deref, SP: Deref, F: Deref, R: Deref, L: Deref> Payer for ChannelManager<M, T, ES, NS, SP, F, R, L>
193193
where
194-
M::Target: chain::Watch<<SP::Target as SignerProvider>::Signer>,
194+
M::Target: chain::Watch<<SP::Target as SignerProvider>::EcdsaSigner>,
195195
T::Target: BroadcasterInterface,
196196
ES::Target: EntropySource,
197197
NS::Target: NodeSigner,

‎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-persister/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl FilesystemPersister {
6060
/// Read `ChannelMonitor`s from disk.
6161
pub fn read_channelmonitors<ES: Deref, SP: Deref> (
6262
&self, entropy_source: ES, signer_provider: SP
63-
) -> std::io::Result<Vec<(BlockHash, ChannelMonitor<<SP::Target as SignerProvider>::Signer>)>>
63+
) -> std::io::Result<Vec<(BlockHash, ChannelMonitor<<SP::Target as SignerProvider>::EcdsaSigner>)>>
6464
where
6565
ES::Target: EntropySource + Sized,
6666
SP::Target: SignerProvider + Sized
@@ -104,7 +104,7 @@ impl FilesystemPersister {
104104

105105
let contents = fs::read(&file.path())?;
106106
let mut buffer = Cursor::new(&contents);
107-
match <(BlockHash, ChannelMonitor<<SP::Target as SignerProvider>::Signer>)>::read(&mut buffer, (&*entropy_source, &*signer_provider)) {
107+
match <(BlockHash, ChannelMonitor<<SP::Target as SignerProvider>::EcdsaSigner>)>::read(&mut buffer, (&*entropy_source, &*signer_provider)) {
108108
Ok((blockhash, channel_monitor)) => {
109109
if channel_monitor.get_funding_txo().0.txid != txid || channel_monitor.get_funding_txo().0.index != index {
110110
return Err(std::io::Error::new(std::io::ErrorKind::InvalidData,

‎lightning/src/chain/channelmonitor.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3896,7 +3896,7 @@ where
38963896
const MAX_ALLOC_SIZE: usize = 64*1024;
38973897

38983898
impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP)>
3899-
for (BlockHash, ChannelMonitor<SP::Signer>) {
3899+
for (BlockHash, ChannelMonitor<SP::EcdsaSigner>) {
39003900
fn read<R: io::Read>(reader: &mut R, args: (&'a ES, &'b SP)) -> Result<Self, DecodeError> {
39013901
macro_rules! unwrap_obj {
39023902
($key: expr) => {
@@ -4082,7 +4082,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
40824082
return Err(DecodeError::InvalidValue);
40834083
}
40844084
}
4085-
let onchain_tx_handler: OnchainTxHandler<SP::Signer> = ReadableArgs::read(
4085+
let onchain_tx_handler: OnchainTxHandler<SP::EcdsaSigner> = ReadableArgs::read(
40864086
reader, (entropy_source, signer_provider, channel_value_satoshis, channel_keys_id)
40874087
)?;
40884088

@@ -4277,7 +4277,7 @@ mod tests {
42774277
assert!(err.contains("ChannelMonitor storage failure")));
42784278
check_added_monitors!(nodes[1], 2); // After the failure we generate a close-channel monitor update
42794279
check_closed_broadcast!(nodes[1], true);
4280-
check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() },
4280+
check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() },
42814281
[nodes[0].node.get_our_node_id()], 100000);
42824282

42834283
// Build a new ChannelMonitorUpdate which contains both the failing commitment tx update

‎lightning/src/chain/onchaintx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
343343
}
344344
}
345345

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

0 commit comments

Comments
 (0)