Merge pull request #1475 from atalw/2022-04-paymentforwarded-event
[rust-lightning] / lightning / src / ln / shutdown_tests.rs
index 5e50ea77cc2cfeb87abc286b46c1f9158cac1026..6543f6b6e90e32fd5b92d418853b2576ca241f28 100644 (file)
@@ -26,11 +26,11 @@ use util::config::UserConfig;
 use bitcoin::blockdata::script::Builder;
 use bitcoin::blockdata::opcodes;
 use bitcoin::network::constants::Network;
+use bitcoin::util::address::WitnessVersion;
 
 use regex;
 
 use core::default::Default;
-use core::num::NonZeroU8;
 
 use ln::functional_test_utils::*;
 use ln::msgs::OptionalField::Present;
@@ -654,7 +654,7 @@ fn test_unsupported_anysegwit_shutdown_script() {
        // Check that using an unsupported shutdown script fails and a supported one succeeds.
        let supported_shutdown_script = chanmon_cfgs[1].keys_manager.get_shutdown_scriptpubkey();
        let unsupported_shutdown_script =
-               ShutdownScript::new_witness_program(NonZeroU8::new(16).unwrap(), &[0, 40]).unwrap();
+               ShutdownScript::new_witness_program(WitnessVersion::V16, &[0, 40]).unwrap();
        chanmon_cfgs[1].keys_manager
                .expect(OnGetShutdownScriptpubkey { returns: unsupported_shutdown_script.clone() })
                .expect(OnGetShutdownScriptpubkey { returns: supported_shutdown_script });