Skip to content

Commit 642d4dc

Browse files
committed
Make Channel and ChannelManager less particular about their Signer type.
1 parent 6d2d526 commit 642d4dc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lightning/src/ln/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ pub(crate) const EXPIRE_PREV_CONFIG_TICKS: usize = 5;
498498
//
499499
// Holder designates channel data owned for the benefice of the user client.
500500
// Counterparty designates channel data owned by the another channel participant entity.
501-
pub(super) struct Channel<Signer: WriteableEcdsaChannelSigner> {
501+
pub(super) struct Channel<Signer: ChannelSigner> {
502502
config: LegacyChannelConfig,
503503

504504
// Track the previous `ChannelConfig` so that we can continue forwarding HTLCs that were

lightning/src/ln/channelmanager.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
5555
use crate::ln::outbound_payment;
5656
use crate::ln::outbound_payment::{OutboundPayments, PendingOutboundPayment};
5757
use crate::ln::wire::Encode;
58-
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, WriteableEcdsaChannelSigner, SignerProvider};
58+
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
5959
use crate::util::config::{UserConfig, ChannelConfig};
6060
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
6161
use crate::util::events;
@@ -452,7 +452,7 @@ pub(crate) enum MonitorUpdateCompletionAction {
452452
}
453453

454454
/// State we hold per-peer.
455-
pub(super) struct PeerState<Signer: WriteableEcdsaChannelSigner> {
455+
pub(super) struct PeerState<Signer: ChannelSigner> {
456456
/// `temporary_channel_id` or `channel_id` -> `channel`.
457457
///
458458
/// Holds all channels where the peer is the counterparty. Once a channel has been assigned a

0 commit comments

Comments
 (0)