From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 3 May 2023 16:33:57 +0000 (+0000)
Subject: Merge pull request #2219 from benthecarman/custom-closing-address
X-Git-Tag: v0.0.116-alpha1~55
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=ca1d5693566b8a44cdf4739bb61f0b102436e172;p=rust-lightning

Merge pull request #2219 from benthecarman/custom-closing-address

Add ability to set shutdown script when closing channel
---

ca1d5693566b8a44cdf4739bb61f0b102436e172
diff --cc lightning/src/ln/shutdown_tests.rs
index aeba82b1c,3fe729b5e..28831e5b2
--- a/lightning/src/ln/shutdown_tests.rs
+++ b/lightning/src/ln/shutdown_tests.rs
@@@ -31,8 -31,10 +31,9 @@@ use bitcoin::util::address::WitnessVers
  use regex;
  
  use core::default::Default;
+ use std::convert::TryFrom;
  
  use crate::ln::functional_test_utils::*;
 -use crate::ln::msgs::OptionalField::Present;
  
  #[test]
  fn pre_funding_lock_shutdown_test() {