f Drop Network newtype for the time being and use Currency::from

Author: tnull

src/lib.rs

@@ -102,7 +102,7 @@ use payment_store::PaymentStore;
 pub use payment_store::{PaymentDetails, PaymentDirection, PaymentStatus};
 use peer_store::{PeerInfo, PeerStore};
 use types::{
-	ChainMonitor, ChannelManager, GossipSync, KeysManager, Network, NetworkGraph, OnionMessenger,
+	ChainMonitor, ChannelManager, GossipSync, KeysManager, NetworkGraph, OnionMessenger,
 	PeerManager, Scorer,
 };
 pub use types::{ChannelId, UserChannelId};
@@ -141,6 +141,7 @@ use bdk::template::Bip84;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey;
+use bitcoin::Network;
 
 use bitcoin::{Address, BlockHash, OutPoint, Txid};
 
@@ -193,7 +194,7 @@ impl Default for Config {
 		Self {
 			storage_dir_path: "/tmp/ldk_node/".to_string(),
 			esplora_server_url: "http://localhost:3002".to_string(),
-			network: Network::default(),
+			network: Network::Regtest,
 			listening_address: Some("0.0.0.0:9735".parse().unwrap()),
 			default_cltv_expiry_delta: 144,
 		}
@@ -276,7 +277,7 @@ impl Builder {
 	///
 	/// Default: `regtest`
 	pub fn set_network(&mut self, network: &str) -> &mut Self {
-		self.config.network = Network::from_str(network).unwrap_or(Network::default());
+		self.config.network = Network::from_str(network).unwrap_or(Network::Regtest);
 		self
 	}
 
@@ -321,13 +322,13 @@ impl Builder {
 			io::utils::read_or_generate_seed_file(&seed_path)
 		};
 
-		let xprv = bitcoin::util::bip32::ExtendedPrivKey::new_master(config.network.0, &seed_bytes)
+		let xprv = bitcoin::util::bip32::ExtendedPrivKey::new_master(config.network, &seed_bytes)
 			.expect("Failed to read wallet master key");
 
 		let wallet_name = bdk::wallet::wallet_name_from_descriptor(
 			Bip84(xprv, bdk::KeychainKind::External),
 			Some(Bip84(xprv, bdk::KeychainKind::Internal)),
-			config.network.0,
+			config.network,
 			&Secp256k1::new(),
 		)
 		.expect("Failed to derive on-chain wallet name");
@@ -338,7 +339,7 @@ impl Builder {
 		let bdk_wallet = bdk::Wallet::new(
 			Bip84(xprv, bdk::KeychainKind::External),
 			Some(Bip84(xprv, bdk::KeychainKind::Internal)),
-			config.network.0,
+			config.network,
 			database,
 		)
 		.expect("Failed to set up on-chain wallet");
@@ -389,7 +390,7 @@ impl Builder {
 				Ok(graph) => Arc::new(graph),
 				Err(e) => {
 					if e.kind() == std::io::ErrorKind::NotFound {
-						Arc::new(NetworkGraph::new(config.network.0, Arc::clone(&logger)))
+						Arc::new(NetworkGraph::new(config.network, Arc::clone(&logger)))
 					} else {
 						log_error!(logger, "Failed to read network graph: {}", e.to_string());
 						panic!("Failed to read network graph: {}", e.to_string());
@@ -466,10 +467,10 @@ impl Builder {
 			} else {
 				// We're starting a fresh node.
 				let genesis_block_hash =
-					bitcoin::blockdata::constants::genesis_block(config.network.0).block_hash();
+					bitcoin::blockdata::constants::genesis_block(config.network).block_hash();
 
 				let chain_params = ChainParameters {
-					network: config.network.0,
+					network: config.network,
 					best_block: BestBlock::new(genesis_block_hash, 0),
 				};
 				channelmanager::ChannelManager::new(
@@ -1358,12 +1359,7 @@ impl Node {
 	fn receive_payment_inner(
 		&self, amount_msat: Option<u64>, description: &str, expiry_secs: u32,
 	) -> Result<Invoice, Error> {
-		let currency = match self.config.network.0 {
-			bitcoin::Network::Bitcoin => Currency::Bitcoin,
-			bitcoin::Network::Testnet => Currency::BitcoinTestnet,
-			bitcoin::Network::Regtest => Currency::Regtest,
-			bitcoin::Network::Signet => Currency::Signet,
-		};
+		let currency = Currency::from(self.config.network);
 		let keys_manager = Arc::clone(&self.keys_manager);
 		let invoice = match lightning_invoice::utils::create_invoice_from_channelmanager(
 			&self.channel_manager,

src/test/functional_tests.rs

@@ -1,6 +1,6 @@
 use crate::test::utils::*;
 use crate::test::utils::{expect_event, random_config};
-use crate::{Builder, Error, Event, Network, PaymentDirection, PaymentStatus};
+use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};
 
 use bitcoin::Amount;
 
@@ -255,7 +255,7 @@ fn connect_to_public_testnet_esplora() {
 	let esplora_url = electrsd.esplora_url.as_ref().unwrap();
 	let mut config = random_config(&esplora_url);
 	config.esplora_server_url = "https://blockstream.info/testnet/api".to_string();
-	config.network = Network(bitcoin::Network::Testnet);
+	config.network = bitcoin::Network::Testnet;
 	let node = Builder::from_config(config).build();
 	node.start().unwrap();
 	node.sync_wallets().unwrap();

src/types.rs

@@ -22,11 +22,9 @@ use lightning_transaction_sync::EsploraSyncClient;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey;
-use bitcoin::{Address, Txid};
+use bitcoin::{Address, Network, Txid};
 
 use std::convert::TryInto;
-use std::default::Default;
-use std::fmt;
 use std::net::SocketAddr;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
@@ -270,58 +268,6 @@ impl Readable for UserChannelId {
 	}
 }
 
-#[derive(PartialEq, Eq, Debug, Copy, Clone)]
-pub struct Network(pub bitcoin::Network);
-
-impl Default for Network {
-	fn default() -> Self {
-		Self(bitcoin::Network::Regtest)
-	}
-}
-
-impl FromStr for Network {
-	type Err = ();
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		let inner = bitcoin::Network::from_str(s).map_err(|_| ())?;
-		Ok(Self(inner))
-	}
-}
-
-impl fmt::Display for Network {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		write!(f, "{}", self.0)
-	}
-}
-
-impl Writeable for Network {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), lightning::io::Error> {
-		let val = match self.0 {
-			bitcoin::Network::Bitcoin => 0u8,
-			bitcoin::Network::Testnet => 1u8,
-			bitcoin::Network::Regtest => 2u8,
-			bitcoin::Network::Signet => 3u8,
-		};
-		Ok(val.write(writer)?)
-	}
-}
-
-impl Readable for Network {
-	fn read<R: lightning::io::Read>(
-		reader: &mut R,
-	) -> Result<Self, lightning::ln::msgs::DecodeError> {
-		let network = match Readable::read(reader)? {
-			0u8 => bitcoin::Network::Bitcoin,
-			1u8 => bitcoin::Network::Testnet,
-			2u8 => bitcoin::Network::Regtest,
-			3u8 => bitcoin::Network::Signet,
-			_ => return Err(lightning::ln::msgs::DecodeError::InvalidValue),
-		};
-
-		Ok(Self(network))
-	}
-}
-
 impl UniffiCustomTypeConverter for Network {
 	type Builtin = String;
 
@@ -330,7 +276,7 @@ impl UniffiCustomTypeConverter for Network {
 	}
 
 	fn from_custom(obj: Self) -> Self::Builtin {
-		obj.0.to_string()
+		obj.to_string()
 	}
 }