f Reuse try_from for new_op_return

Author: tnull

lightning/src/ln/script.rs

@@ -81,18 +81,13 @@ impl ShutdownScript {
 	/// This is only needed and valid for channels supporting `option_simple_close`. Please refer
 	/// to [BOLT-2] for more information.
 	///
-	/// Will return [`InvalidShutdownScript`] if the given data is not [BOLT-2] compliant based on
-	/// the given features.
+	/// # Errors
+	///
+	/// This function may return an error if `program` is not [BOLT-2] compliant.
 	///
 	/// [BOLT-2]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#closing-negotiation-closing_complete-and-closing_sig
-	pub fn new_op_return<T: AsRef<PushBytes>>(
-		data: T, features: &InitFeatures,
-	) -> Result<Self, InvalidShutdownScript> {
-		let script = ScriptBuf::new_op_return(data);
-		if !is_bolt2_compliant(&script, features) {
-			return Err(InvalidShutdownScript { script });
-		}
-		Ok(Self(ShutdownScriptImpl::Bolt2(script)))
+	pub fn new_op_return<T: AsRef<PushBytes>>(data: T) -> Result<Self, InvalidShutdownScript> {
+		Self::try_from(ScriptBuf::new_op_return(data))
 	}
 
 	/// Generates a witness script pubkey from the given segwit version and program.
@@ -238,10 +233,8 @@ mod shutdown_script_tests {
 	use bitcoin::secp256k1::{PublicKey, SecretKey};
 	use bitcoin::{WitnessProgram, WitnessVersion};
 
-	use crate::ln::channelmanager::provided_init_features;
 	use crate::prelude::*;
 	use crate::types::features::InitFeatures;
-	use crate::util::config::UserConfig;
 
 	fn pubkey() -> bitcoin::key::PublicKey {
 		let secp_ctx = Secp256k1::signing_only();
@@ -317,9 +310,8 @@ mod shutdown_script_tests {
 	#[test]
 	fn generates_op_return_from_data() {
 		let data = [6; 6];
-		let features = provided_init_features(&UserConfig::default());
 		let op_return_script = ScriptBuf::new_op_return(&data);
-		let shutdown_script = ShutdownScript::new_op_return(&data, &features).unwrap();
+		let shutdown_script = ShutdownScript::new_op_return(&data).unwrap();
 		assert!(shutdown_script.is_compatible(&simple_close_features()));
 		assert!(!shutdown_script.is_compatible(&InitFeatures::empty()));
 		assert_eq!(shutdown_script.into_inner(), op_return_script);
@@ -380,9 +372,8 @@ mod shutdown_script_tests {
 		assert!(ShutdownScript::try_from(pushdata_script).is_err());
 
 		// - In `ShutdownScript::new_op_return` the OP_RETURN data is longer than 80 bytes.
-		let features = provided_init_features(&UserConfig::default());
 		let big_buffer = &[1u8; 81][..];
 		let push_bytes: &PushBytes = big_buffer.try_into().unwrap();
-		assert!(ShutdownScript::new_op_return(&push_bytes, &features).is_err());
+		assert!(ShutdownScript::new_op_return(&push_bytes).is_err());
 	}
 }