f - move SigningPubkey to separate module

Author: jkczyz

lightning/src/offers/mod.rs

@@ -19,3 +19,4 @@ pub mod offer;
 pub mod parse;
 mod payer;
 pub mod refund;
+pub mod signer;

lightning/src/offers/offer.rs

@@ -83,6 +83,7 @@ use crate::ln::msgs::MAX_VALUE_MSAT;
 use crate::offers::invoice_request::InvoiceRequestBuilder;
 use crate::offers::merkle::TlvStream;
 use crate::offers::parse::{Bech32Encode, ParseError, ParsedMessage, SemanticError};
+use crate::offers::signer::SigningPubkey;
 use crate::onion_message::BlindedPath;
 use crate::util::ser::{HighZeroBytesDroppedBigSize, WithoutLength, Writeable, Writer};
 use crate::util::string::PrintableString;
@@ -92,21 +93,6 @@ use crate::prelude::*;
 #[cfg(feature = "std")]
 use std::time::SystemTime;
 
-/// A pubkey for signing invoices, either given explicitly or derived.
-pub enum SigningPubkey<'a> {
-	/// A pubkey that is typically known like a node id.
-	Explicit(PublicKey),
-
-	/// Data needed to derive a pubkey.
-	Derived(&'a ExpandedKey, Nonce),
-}
-
-impl<'a> From<PublicKey> for SigningPubkey<'a> {
-	fn from(pubkey: PublicKey) -> Self {
-		SigningPubkey::Explicit(pubkey)
-	}
-}
-
 /// Builds an [`Offer`] for the "offer to be paid" flow.
 ///
 /// See [module-level documentation] for usage.
@@ -760,7 +746,7 @@ impl core::fmt::Display for Offer {
 
 #[cfg(test)]
 mod tests {
-	use super::{Amount, Offer, OfferBuilder, OfferTlvStreamRef, Quantity, SigningPubkey};
+	use super::{Amount, Offer, OfferBuilder, OfferTlvStreamRef, Quantity};
 
 	use bitcoin::blockdata::constants::ChainHash;
 	use bitcoin::network::constants::Network;
@@ -774,6 +760,7 @@ mod tests {
 	use crate::ln::inbound_payment::{ExpandedKey, Nonce};
 	use crate::ln::msgs::{DecodeError, MAX_VALUE_MSAT};
 	use crate::offers::parse::{ParseError, SemanticError};
+	use crate::offers::signer::SigningPubkey;
 	use crate::onion_message::{BlindedHop, BlindedPath};
 	use crate::util::ser::{BigSize, Writeable};
 	use crate::util::string::PrintableString;

lightning/src/offers/signer.rs

@@ -0,0 +1,28 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+//! Data structures for signing offer messages.
+
+use bitcoin::secp256k1::PublicKey;
+use crate::ln::inbound_payment::{ExpandedKey, Nonce};
+
+/// A pubkey for signing messages, either given explicitly or derived.
+pub enum SigningPubkey<'a> {
+	/// A pubkey that is typically known like a node id.
+	Explicit(PublicKey),
+
+	/// Data needed to derive a pubkey.
+	Derived(&'a ExpandedKey, Nonce),
+}
+
+impl<'a> From<PublicKey> for SigningPubkey<'a> {
+	fn from(pubkey: PublicKey) -> Self {
+		SigningPubkey::Explicit(pubkey)
+	}
+}