Merge pull request #2727 from TheBlueMatt/2023-11-better-bolt11-utils

[rust-lightning] / lightning / src / ln / script.rs

diff --git a/lightning/src/ln/script.rs b/lightning/src/ln/script.rs
index d5094f69ce1aac5390415d25183601e65a875161..079416eae77d29dcca818256950451a4b835eb7a 100644 (file)
--- a/lightning/src/ln/script.rs
+++ b/lightning/src/ln/script.rs
@@ -44,10 +44,6 @@ impl Writeable for ShutdownScript {
        fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
                self.0.write(w)
        }
-
-       fn serialized_length(&self) -> usize {
-               self.0.serialized_length()
-       }
 }
 
 impl Readable for ShutdownScript {
@@ -135,7 +131,7 @@ impl TryFrom<Script> for ShutdownScript {
        type Error = InvalidShutdownScript;
 
        fn try_from(script: Script) -> Result<Self, Self::Error> {
-               Self::try_from((script, &channelmanager::provided_init_features()))
+               Self::try_from((script, &channelmanager::provided_init_features(&crate::util::config::UserConfig::default())))
        }
 }