From: Arik Sosman <git@arik.io>
Date: Fri, 20 Jan 2023 00:41:15 +0000 (-0800)
Subject: Make `Channel` and `ChannelManager` less particular about their `Signer` type.
X-Git-Tag: v0.0.114-beta~48^2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=712c60e1c78481ba612ba6e5b0bc12cc9f10ba98;p=rust-lightning

Make `Channel` and `ChannelManager` less particular about their `Signer` type.
---

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 185fd59ba..d9ec57d5a 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -498,7 +498,7 @@ pub(crate) const EXPIRE_PREV_CONFIG_TICKS: usize = 5;
 //
 // Holder designates channel data owned for the benefice of the user client.
 // Counterparty designates channel data owned by the another channel participant entity.
-pub(super) struct Channel<Signer: WriteableEcdsaChannelSigner> {
+pub(super) struct Channel<Signer: ChannelSigner> {
 	config: LegacyChannelConfig,
 
 	// Track the previous `ChannelConfig` so that we can continue forwarding HTLCs that were
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 03707e749..82640ad15 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -55,7 +55,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
 use crate::ln::outbound_payment;
 use crate::ln::outbound_payment::{OutboundPayments, PendingOutboundPayment};
 use crate::ln::wire::Encode;
-use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, WriteableEcdsaChannelSigner, SignerProvider};
+use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
 use crate::util::config::{UserConfig, ChannelConfig};
 use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
 use crate::util::events;
@@ -452,7 +452,7 @@ pub(crate) enum MonitorUpdateCompletionAction {
 }
 
 /// State we hold per-peer.
-pub(super) struct PeerState<Signer: WriteableEcdsaChannelSigner> {
+pub(super) struct PeerState<Signer: ChannelSigner> {
 	/// `temporary_channel_id` or `channel_id` -> `channel`.
 	///
 	/// Holds all channels where the peer is the counterparty. Once a channel has been assigned a