f Account for keysmanager methods returning a Result

Author: tnull

src/wallet.rs

@@ -6,12 +6,12 @@ use lightning::chain::chaininterface::{
 	BroadcasterInterface, ConfirmationTarget, FeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
 };
 
+use lightning::ln::msgs::{DecodeError, UnsignedGossipMessage};
+use lightning::ln::script::ShutdownScript;
 use lightning::sign::{
 	EntropySource, InMemorySigner, KeyMaterial, KeysManager, NodeSigner, Recipient, SignerProvider,
 	SpendableOutputDescriptor,
 };
-use lightning::ln::msgs::{DecodeError, UnsignedGossipMessage};
-use lightning::ln::script::ShutdownScript;
 
 use lightning::util::message_signing;
 
@@ -446,19 +446,16 @@ where
 		self.inner.read_chan_signer(reader)
 	}
 
-	fn get_destination_script(&self) -> Script {
-		let address =
-			self.wallet.get_new_address().expect("Failed to retrieve new address from wallet.");
-		address.script_pubkey()
+	fn get_destination_script(&self) -> Result<Script, ()> {
+		let address = self.wallet.get_new_address().map_err(|_| ())?;
+		Ok(address.script_pubkey())
 	}
 
-	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
-		let address =
-			self.wallet.get_new_address().expect("Failed to retrieve new address from wallet.");
+	fn get_shutdown_scriptpubkey(&self) -> Result<ShutdownScript, ()> {
+		let address = self.wallet.get_new_address().map_err(|_| ())?;
 		match address.payload {
 			bitcoin::util::address::Payload::WitnessProgram { version, program } => {
-				return ShutdownScript::new_witness_program(version, &program)
-					.expect("Invalid shutdown script.");
+				ShutdownScript::new_witness_program(version, &program).map_err(|_| ())
 			}
 			_ => panic!("Tried to use a non-witness address. This must not ever happen."),
 		}