Removed method that was no longer of much use

Author: galderz

lightning/src/ln/channel.rs

@@ -4018,12 +4018,8 @@ fn is_unsupported_shutdown_script(their_features: &InitFeatures, scriptpubkey: &
 	// which for a a BIP-141-compliant witness program is at max 42 bytes in length.
 	// So don't let the remote peer feed us some super fee-heavy script.
 	let is_script_too_long = is_outbound && scriptpubkey.len() > 42;
-	return is_script_too_long || (is_unsupported_witness_shutdown_script(their_features, scriptpubkey) && !scriptpubkey.is_p2pkh() && !scriptpubkey.is_p2sh() && !scriptpubkey.is_v0_p2wpkh() && !scriptpubkey.is_v0_p2wsh())
-}
-
-fn is_unsupported_witness_shutdown_script(their_features: &InitFeatures, scriptpubkey: &Script) -> bool {
-	return !their_features.supports_shutdown_anysegwit()
-		&& scriptpubkey.is_witness_program()
+	let not_valid_witness = !their_features.supports_shutdown_anysegwit() && scriptpubkey.is_witness_program();
+	return is_script_too_long || (not_valid_witness && !scriptpubkey.is_p2pkh() && !scriptpubkey.is_p2sh() && !scriptpubkey.is_v0_p2wpkh() && !scriptpubkey.is_v0_p2wsh())
 }
 
 const SERIALIZATION_VERSION: u8 = 1;