f - remove uninitialized variant

Author: alecchendev

lightning/src/ln/channel.rs

@@ -1121,14 +1121,19 @@ pub(crate) struct ShutdownResult {
 
 #[derive(Debug, Copy, Clone)]
 enum HolderCommitmentPoint {
-	Uninitialized { transaction_number: u64 },
 	PendingNext { transaction_number: u64, current: PublicKey },
 	Available { transaction_number: u64, current: PublicKey, next: PublicKey },
 }
 
-impl HolderCommitmentPoint where {
-	pub fn new() -> Self {
-		HolderCommitmentPoint::Uninitialized { transaction_number: INITIAL_COMMITMENT_NUMBER }
+impl HolderCommitmentPoint {
+	pub fn new<SP: Deref>(signer: &ChannelSignerType<SP>, secp_ctx: &Secp256k1<secp256k1::All>) -> Self
+		where SP::Target: SignerProvider
+	{
+		HolderCommitmentPoint::Available {
+			transaction_number: INITIAL_COMMITMENT_NUMBER,
+			current: signer.as_ref().get_per_commitment_point(INITIAL_COMMITMENT_NUMBER, secp_ctx),
+			next: signer.as_ref().get_per_commitment_point(INITIAL_COMMITMENT_NUMBER - 1, secp_ctx),
+		}
 	}
 
 	pub fn is_available(&self) -> bool {
@@ -1137,23 +1142,20 @@ impl HolderCommitmentPoint where {
 
 	pub fn transaction_number(&self) -> u64 {
 		match self {
-			HolderCommitmentPoint::Uninitialized { transaction_number } => *transaction_number,
 			HolderCommitmentPoint::PendingNext { transaction_number, .. } => *transaction_number,
 			HolderCommitmentPoint::Available { transaction_number, .. } => *transaction_number,
 		}
 	}
 
-	pub fn current_point(&self) -> Option<PublicKey> {
+	pub fn current_point(&self) -> PublicKey {
 		match self {
-			HolderCommitmentPoint::Uninitialized { .. } => None,
-			HolderCommitmentPoint::PendingNext { current, .. } => Some(*current),
-			HolderCommitmentPoint::Available { current, .. } => Some(*current),
+			HolderCommitmentPoint::PendingNext { current, .. } => *current,
+			HolderCommitmentPoint::Available { current, .. } => *current,
 		}
 	}
 
 	pub fn next_point(&self) -> Option<PublicKey> {
 		match self {
-			HolderCommitmentPoint::Uninitialized { .. } => None,
 			HolderCommitmentPoint::PendingNext { .. } => None,
 			HolderCommitmentPoint::Available { next, .. } => Some(*next),
 		}
@@ -1162,13 +1164,6 @@ impl HolderCommitmentPoint where {
 	pub fn advance<SP: Deref, L: Deref>(&mut self, signer: &ChannelSignerType<SP>, secp_ctx: &Secp256k1<secp256k1::All>, logger: &L)
 		where SP::Target: SignerProvider, L::Target: Logger
 	{
-		if let HolderCommitmentPoint::Uninitialized { transaction_number } = self {
-			let current = signer.as_ref().get_per_commitment_point(*transaction_number, secp_ctx); // TODO
-			log_trace!(logger, "Retrieved current per-commitment point {}", transaction_number);
-			*self = HolderCommitmentPoint::PendingNext { transaction_number: *transaction_number, current };
-			// TODO: handle error case when get_per_commitment_point becomes async
-		}
-
 		if let HolderCommitmentPoint::Available { transaction_number, next, .. } = self {
 			*self = HolderCommitmentPoint::PendingNext {
 				transaction_number: *transaction_number - 1,
@@ -1177,10 +1172,9 @@ impl HolderCommitmentPoint where {
 		}
 
 		if let HolderCommitmentPoint::PendingNext { transaction_number, current } = self {
-			let next = signer.as_ref().get_per_commitment_point(*transaction_number - 1, secp_ctx); // TODO
+			let next = signer.as_ref().get_per_commitment_point(*transaction_number - 1, secp_ctx);
 			log_trace!(logger, "Retrieved next per-commitment point {}", *transaction_number - 1);
 			*self = HolderCommitmentPoint::Available { transaction_number: *transaction_number, current: *current, next };
-			// TODO: handle error case when get_per_commitment_point becomes async
 		}
 	}
 }