remove some unused imports and implement Error trait for APIError

Author: joemphilips

bindings/src/adaptors/primitives.rs

@@ -176,7 +176,7 @@ impl<'a> TryFrom<FFIRouteHop<'a>> for RouteHop {
 
     fn try_from(value: FFIRouteHop<'a>) -> Result<Self, Self::Error> {
         Ok(RouteHop {
-            pubkey: value.pubkey.clone().try_into()?,
+            pubkey: value.pubkey.try_into()?,
             node_features: value.node_features.into(),
             short_channel_id: value.short_channel_id,
             channel_features: value.channel_features.into(),

bindings/src/channelmanager.rs

@@ -1,5 +1,5 @@
 use std::{
-    convert::{TryFrom, TryInto},
+    convert::{TryInto},
     sync::Arc,
     time::{SystemTime, UNIX_EPOCH}
 };
@@ -8,20 +8,15 @@ use lightning::{
     ln::channelmanager::{ChannelManager, PaymentHash},
     chain::keysinterface::{KeysManager, InMemoryChannelKeys},
     util::config::UserConfig,
-    ln::channelmonitor::{ManyChannelMonitor, SimpleManyChannelMonitor},
     ln::router::Route,
 };
 
 use crate::{
     error::FFIResult,
     handle::{Out, Ref, HandleShared},
     adaptors::*,
-    adaptors::primitives::{Seed, FFISha256dHash, FFIRoute},
-    broadcaster::FFIBroadCasterHandle,
-    chainwatcher::ChainWatchInterfaceHandle,
-    channelmonitor::{FFIManyChannelMonitorHandle, FFIManyChannelMonitor},
-    logger::FFILoggerHandle,
-    fee_estimator::FeeEstimatorHandle
+    adaptors::primitives::{FFISha256dHash, FFIRoute},
+    channelmonitor::{FFIManyChannelMonitor},
 };
 
 type FFIArcChannelManager = ChannelManager<InMemoryChannelKeys, Arc<FFIManyChannelMonitor>, Arc<FFIBroadCaster>, Arc<KeysManager>, Arc<FFIFeeEstimator>>;
@@ -104,7 +99,7 @@ ffi! {
         let payment_hash_ffi: &FFISha256dHash = unsafe_block!("We know it points to valid hash data" => payment_hash_ref.as_ref());
         let payment_hash: PaymentHash = payment_hash_ffi.clone().try_into()?;
         let route: Route = route_ffi.clone().try_into()?;
-        chan_man.send_payment(route, payment_hash);
+        chan_man.send_payment(route, payment_hash)?;
         FFIResult::ok()
     }
 

bindings/src/channelmonitor.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use lightning::chain::transaction::OutPoint;
 use lightning::chain::keysinterface::{InMemoryChannelKeys};
-use lightning::ln::channelmonitor::{SimpleManyChannelMonitor, HTLCUpdate, ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr};
+use lightning::ln::channelmonitor::{SimpleManyChannelMonitor};
 
 use crate::adaptors::{FFIBroadCaster, FFIFeeEstimator, FFILogger, FFIChainWatchInterface, chain_watch_interface_fn, broadcaster_fn, fee_estimator_fn, ffilogger_fn};
 use crate::error::FFIResult;

bindings/src/error.rs

@@ -8,6 +8,7 @@ use std::panic::{catch_unwind, UnwindSafe};
 use std::any::Any;
 use std::sync::atomic::{AtomicU32, Ordering};
 
+use lightning::util::errors::APIError;
 use crate::utils::option_extensions::OptionMutExt;
 
 static LAST_ERR_ID: AtomicU32 = AtomicU32::new(0);

lightning/src/util/errors.rs

@@ -1,6 +1,7 @@
 //! Error types live here.
 
 use std::fmt;
+use bitcoin_hashes::core::fmt::{Formatter, Error};
 
 /// Indicates an error on the client's part (usually some variant of attempting to use too-low or
 /// too-high values)
@@ -50,6 +51,14 @@ impl fmt::Debug for APIError {
 	}
 }
 
+impl fmt::Display for APIError {
+	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
+	}
+}
+
+impl std::error::Error for APIError {}
+
 #[inline]
 pub(crate) fn get_onion_debug_field(error_code: u16) -> (&'static str, usize) {
 	match error_code & 0xff {