f Various type fixes

Author: tnull

bindings/ldk_node.udl

@@ -73,7 +73,6 @@ enum NodeError {
 	"ConnectionFailed",
 	"InvoiceCreationFailed",
 	"PaymentFailed",
-	"PeerInfoParseFailed",
 	"PeerInfoNotFound",
 	"ChannelCreationFailed",
 	"ChannelClosingFailed",
@@ -84,6 +83,7 @@ enum NodeError {
 	"TxSyncFailed",
 	"GossipUpdateFailed",
 	"InvalidAddress",
+	"InvalidNetAddress",
 	"InvalidPublicKey",
 	"InvalidPaymentHash",
 	"InvalidPaymentPreimage",

src/error.rs

@@ -15,8 +15,6 @@ pub enum Error {
 	InvoiceCreationFailed,
 	/// An attempted payment has failed.
 	PaymentFailed,
-	/// A given peer info could not be parsed.
-	PeerInfoParseFailed,
 	/// A given peer info could not be found.
 	PeerInfoNotFound,
 	/// A channel could not be opened.
@@ -37,6 +35,8 @@ pub enum Error {
 	GossipUpdateFailed,
 	/// The given address is invalid.
 	InvalidAddress,
+	/// The given network address is invalid.
+	InvalidNetAddress,
 	/// The given public key is invalid.
 	InvalidPublicKey,
 	/// The given payment hash is invalid.
@@ -70,7 +70,6 @@ impl fmt::Display for Error {
 			Self::ConnectionFailed => write!(f, "Network connection closed."),
 			Self::InvoiceCreationFailed => write!(f, "Failed to create invoice."),
 			Self::PaymentFailed => write!(f, "Failed to send the given payment."),
-			Self::PeerInfoParseFailed => write!(f, "Failed to parse the given peer information."),
 			Self::PeerInfoNotFound => write!(f, "Failed to resolve the given peer information."),
 			Self::ChannelCreationFailed => write!(f, "Failed to create channel."),
 			Self::ChannelClosingFailed => write!(f, "Failed to close channel."),
@@ -81,6 +80,7 @@ impl fmt::Display for Error {
 			Self::TxSyncFailed => write!(f, "Failed to sync transactions."),
 			Self::GossipUpdateFailed => write!(f, "Failed to update gossip data."),
 			Self::InvalidAddress => write!(f, "The given address is invalid."),
+			Self::InvalidNetAddress => write!(f, "The given network address is invalid."),
 			Self::InvalidPublicKey => write!(f, "The given public key is invalid."),
 			Self::InvalidPaymentHash => write!(f, "The given payment hash is invalid."),
 			Self::InvalidPaymentPreimage => write!(f, "The given payment preimage is invalid."),

src/types.rs

@@ -285,7 +285,7 @@ impl UniffiCustomTypeConverter for Network {
 impl UniffiCustomTypeConverter for Txid {
 	type Builtin = String;
 	fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
-		Ok(Txid::from_str(&val).unwrap())
+		Ok(Txid::from_str(&val)?)
 	}
 
 	fn from_custom(obj: Self) -> Self::Builtin {
@@ -407,11 +407,7 @@ impl UniffiCustomTypeConverter for SocketAddr {
 	type Builtin = String;
 
 	fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
-		if let Ok(addr) = SocketAddr::from_str(&val) {
-			return Ok(addr);
-		}
-
-		Err(Error::InvalidPublicKey.into())
+		Ok(SocketAddr::from_str(&val).map_err(|_| Error::InvalidNetAddress)?)
 	}
 
 	fn from_custom(obj: Self) -> Self::Builtin {
@@ -434,7 +430,7 @@ impl Display for NetAddress {
 			}
 			LdkNetAddress::IPv6 { addr, port } => {
 				let ip_addr = Ipv6Addr::from(addr);
-				write!(f, "{}:{}", ip_addr, port)
+				write!(f, "[{}]:{}", ip_addr, port)
 			}
 			LdkNetAddress::Hostname { ref hostname, port } => {
 				write!(f, "{}:{}", hostname.as_str(), port)
@@ -454,7 +450,7 @@ impl Display for NetAddress {
 impl UniffiCustomTypeConverter for NetAddress {
 	type Builtin = String;
 	fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
-		Ok(NetAddress::from_str(&val).unwrap())
+		Ok(NetAddress::from_str(&val).map_err(|_| Error::InvalidNetAddress)?)
 	}
 
 	fn from_custom(obj: Self) -> Self::Builtin {
@@ -491,11 +487,9 @@ impl FromStr for NetAddress {
 					Err(_) => return Err(()),
 				};
 
-				if let Ok(hostname) = Hostname::try_from(host.to_string()) {
-					return Ok(Self(LdkNetAddress::Hostname { hostname, port }));
-				}
-
-				Err(())
+				Hostname::try_from(host.to_string())
+					.map(|hostname| Self(LdkNetAddress::Hostname { hostname, port }))
+					.map_err(|_| ())
 			}
 		}
 	}