X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=7b406891703bcecf0d19c8fdd98c06418dd5f16e;hb=c70ea1d987baef7b0d658d476eb09c281f98bd65;hp=38c605515cc0134bb2972d30635c9f21568bb158;hpb=de4dd95d29f242820615ace081d5f3d1e3386ff8;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 38c60551..7b406891 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -37,7 +37,8 @@ use crate::chain::BestBlock;
 use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, LowerBoundedFeeEstimator};
 use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, LATENCY_GRACE_PERIOD_BLOCKS, CLOSED_CHANNEL_UPDATE_ID};
 use crate::chain::transaction::{OutPoint, TransactionData};
-use crate::sign::{EcdsaChannelSigner, WriteableEcdsaChannelSigner, EntropySource, ChannelSigner, SignerProvider, NodeSigner, Recipient};
+use crate::sign::ecdsa::{EcdsaChannelSigner, WriteableEcdsaChannelSigner};
+use crate::sign::{EntropySource, ChannelSigner, SignerProvider, NodeSigner, Recipient};
 use crate::events::ClosureReason;
 use crate::routing::gossip::NodeId;
 use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
@@ -2144,6 +2145,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 					.map(|(sig, _)| sig).ok()?
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		};
 
@@ -2198,6 +2200,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 				(counterparty_initial_commitment_tx, funding_signed)
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -3491,6 +3494,7 @@ impl<SP: Deref> Channel<SP> where
 				).map_err(|_| ChannelError::Close("Failed to validate revocation from peer".to_owned()))?;
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		};
 
@@ -4446,6 +4450,7 @@ impl<SP: Deref> Channel<SP> where
 				}), None, None))
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -4699,6 +4704,7 @@ impl<SP: Deref> Channel<SP> where
 						}), signed_tx, shutdown_result))
 					},
 					// TODO (taproot|arik)
+					#[cfg(taproot)]
 					_ => todo!()
 				}
 			}
@@ -5332,6 +5338,7 @@ impl<SP: Deref> Channel<SP> where
 				})
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -5361,6 +5368,7 @@ impl<SP: Deref> Channel<SP> where
 					})
 				},
 				// TODO (taproot|arik)
+				#[cfg(taproot)]
 				_ => todo!()
 			}
 		} else {
@@ -5736,6 +5744,7 @@ impl<SP: Deref> Channel<SP> where
 				}, (counterparty_commitment_txid, commitment_stats.htlcs_included)))
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -8361,7 +8370,7 @@ use crate::ln::channelmanager::{self, HTLCSource, PaymentId};
 		use bitcoin::hashes::hex::FromHex;
 		use bitcoin::hash_types::Txid;
 		use bitcoin::secp256k1::Message;
-		use crate::sign::{ChannelDerivationParameters, HTLCDescriptor, EcdsaChannelSigner};
+		use crate::sign::{ChannelDerivationParameters, HTLCDescriptor, ecdsa::EcdsaChannelSigner};
 		use crate::ln::PaymentPreimage;
 		use crate::ln::channel::{HTLCOutputInCommitment ,TxCreationKeys};
 		use crate::ln::channel_keys::{DelayedPaymentBasepoint, HtlcBasepoint};
@@ -9104,7 +9113,7 @@ use crate::ln::channelmanager::{self, HTLCSource, PaymentId};
 		assert_eq!(chan_utils::build_commitment_secret(&seed, 1),
 		           <Vec<u8>>::from_hex("915c75942a26bb3a433a8ce2cb0427c29ec6c1775cfc78328b57f6ba7bfeaa9c").unwrap()[..]);
 	}
-	
+
 	#[test]
 	fn test_key_derivation() {
 		// Test vectors from BOLT 3 Appendix E: