rustfmt: Run on lightning/src/ln/script.rs

Author: tnull

lightning/src/ln/script.rs

@@ -1,14 +1,14 @@
 //! Abstractions for scripts used in the Lightning Network.
 
-use bitcoin::{WitnessProgram, WPubkeyHash, WScriptHash};
+use bitcoin::hashes::Hash;
 use bitcoin::opcodes::all::OP_PUSHBYTES_0 as SEGWIT_V0;
 use bitcoin::script::{Script, ScriptBuf};
-use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey;
+use bitcoin::{WPubkeyHash, WScriptHash, WitnessProgram};
 
 use crate::ln::channelmanager;
-use crate::types::features::InitFeatures;
 use crate::ln::msgs::DecodeError;
+use crate::types::features::InitFeatures;
 use crate::util::ser::{Readable, Writeable, Writer};
 
 use crate::io;
@@ -28,7 +28,7 @@ pub struct InvalidShutdownScript {
 	/// The script that did not meet the requirements from [BOLT #2].
 	///
 	/// [BOLT #2]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md
-	pub script: ScriptBuf
+	pub script: ScriptBuf,
 }
 
 #[derive(Clone, PartialEq, Eq)]
@@ -82,7 +82,9 @@ impl ShutdownScript {
 	/// # Errors
 	///
 	/// This function may return an error if `program` is invalid for the segwit `version`.
-	pub fn new_witness_program(witness_program: &WitnessProgram) -> Result<Self, InvalidShutdownScript> {
+	pub fn new_witness_program(
+		witness_program: &WitnessProgram,
+	) -> Result<Self, InvalidShutdownScript> {
 		Self::try_from(ScriptBuf::new_witness_program(witness_program))
 	}
 
@@ -128,7 +130,10 @@ impl TryFrom<ScriptBuf> for ShutdownScript {
 	type Error = InvalidShutdownScript;
 
 	fn try_from(script: ScriptBuf) -> Result<Self, Self::Error> {
-		Self::try_from((script, &channelmanager::provided_init_features(&crate::util::config::UserConfig::default())))
+		Self::try_from((
+			script,
+			&channelmanager::provided_init_features(&crate::util::config::UserConfig::default()),
+		))
 	}
 }
 
@@ -149,14 +154,15 @@ impl TryFrom<(ScriptBuf, &InitFeatures)> for ShutdownScript {
 impl Into<ScriptBuf> for ShutdownScript {
 	fn into(self) -> ScriptBuf {
 		match self.0 {
-			ShutdownScriptImpl::Legacy(pubkey) =>
-				ScriptBuf::new_p2wpkh(&WPubkeyHash::hash(&pubkey.serialize())),
+			ShutdownScriptImpl::Legacy(pubkey) => {
+				ScriptBuf::new_p2wpkh(&WPubkeyHash::hash(&pubkey.serialize()))
+			},
 			ShutdownScriptImpl::Bolt2(script_pubkey) => script_pubkey,
 		}
 	}
 }
 
-impl core::fmt::Display for ShutdownScript{
+impl core::fmt::Display for ShutdownScript {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
 		match &self.0 {
 			ShutdownScriptImpl::Legacy(_) => self.clone().into_inner().fmt(f),
@@ -169,18 +175,22 @@ impl core::fmt::Display for ShutdownScript{
 mod shutdown_script_tests {
 	use super::ShutdownScript;
 
-	use bitcoin::{WitnessProgram, WitnessVersion};
 	use bitcoin::opcodes;
 	use bitcoin::script::{Builder, ScriptBuf};
 	use bitcoin::secp256k1::Secp256k1;
 	use bitcoin::secp256k1::{PublicKey, SecretKey};
+	use bitcoin::{WitnessProgram, WitnessVersion};
 
-	use crate::types::features::InitFeatures;
 	use crate::prelude::*;
+	use crate::types::features::InitFeatures;
 
 	fn pubkey() -> bitcoin::key::PublicKey {
 		let secp_ctx = Secp256k1::signing_only();
-		let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
+		let secret_key = SecretKey::from_slice(&[
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 1,
+		])
+		.unwrap();
 		bitcoin::key::PublicKey::new(PublicKey::from_secret_key(&secp_ctx, &secret_key))
 	}