nits

Author: devrandom

lightning/src/ln/chan_utils.rs

@@ -150,7 +150,7 @@ pub struct ChannelPublicKeys {
 	pub htlc_basepoint: PublicKey,
 }
 
-impl_writeable!(ChannelPublicKeys, 0, {
+impl_writeable!(ChannelPublicKeys, 33*5, {
 	funding_pubkey,
 	revocation_basepoint,
 	payment_basepoint,

lightning/src/ln/channel.rs

@@ -539,14 +539,14 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 	/// Assumes chain_hash has already been checked and corresponds with what we expect!
 	pub fn new_from_req(fee_estimator: &FeeEstimator, keys_provider: &Arc<KeysInterface<ChanKeySigner = ChanSigner>>, their_node_id: PublicKey, their_features: InitFeatures, msg: &msgs::OpenChannel, user_id: u64, logger: Arc<Logger>, config: &UserConfig) -> Result<Channel<ChanSigner>, ChannelError> {
 		let mut chan_keys = keys_provider.get_channel_keys(true);
-		let channel_pubkeys = ChannelPublicKeys {
+		let their_pubkeys = ChannelPublicKeys {
 			funding_pubkey: msg.funding_pubkey,
 			revocation_basepoint: msg.revocation_basepoint,
 			payment_basepoint: msg.payment_basepoint,
 			delayed_payment_basepoint: msg.delayed_payment_basepoint,
 			htlc_basepoint: msg.htlc_basepoint
 		};
-		chan_keys.set_remote_channel_pubkeys(&channel_pubkeys);
+		chan_keys.set_remote_channel_pubkeys(&their_pubkeys);
 		let mut local_config = (*config).channel_options.clone();
 
 		if config.own_channel_config.our_to_self_delay < BREAKDOWN_TIMEOUT {
@@ -728,13 +728,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 			their_max_accepted_htlcs: msg.max_accepted_htlcs,
 			minimum_depth: config.own_channel_config.minimum_depth,
 
-			their_pubkeys: Some(ChannelPublicKeys {
-				funding_pubkey: msg.funding_pubkey,
-				revocation_basepoint: msg.revocation_basepoint,
-				payment_basepoint: msg.payment_basepoint,
-				delayed_payment_basepoint: msg.delayed_payment_basepoint,
-				htlc_basepoint: msg.htlc_basepoint,
-			}),
+			their_pubkeys: Some(their_pubkeys),
 			their_cur_commitment_point: Some(msg.first_per_commitment_point),
 
 			their_prev_commitment_point: None,