f move to new crate, note that its still kept in-tree

Author: TheBlueMatt

Cargo.toml

@@ -16,6 +16,7 @@ members = [
     "lightning-macros",
     "lightning-dns-resolver",
     "lightning-liquidity",
+    "lightning-tests",
     "possiblyrandom",
 ]
 

ci/ci-tests.sh

@@ -44,6 +44,7 @@ WORKSPACE_MEMBERS=(
 	lightning-macros
 	lightning-dns-resolver
 	lightning-liquidity
+	lightning-tests
 	possiblyrandom
 )
 

lightning-tests/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "lightning-tests"
+version = "0.0.1"
+authors = ["Matt Corallo"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/lightningdevkit/rust-lightning/"
+description = "Tests for LDK crates"
+edition = "2021"
+
+[features]
+
+[dependencies]
+lightning-types = { version = "0.3.0", path = "../lightning-types", features = ["_test_utils"] }
+lightning-invoice = { version = "0.34.0", path = "../lightning-invoice", default-features = false }
+lightning-macros = { version = "0.2", path = "../lightning-macros" }
+lightning = { version = "0.2", path = "../lightning", features = ["_test_utils"] }
+lightning_0_1 = { package = "lightning", version = "0.1.1", features = ["_test_utils"] }
+
+bitcoin = { version = "0.32.2", default-features = false }
+
+[dev-dependencies]
+
+
+[lints]
+workspace = true

lightning-tests/src/lib.rs

@@ -0,0 +1,5 @@
+#[cfg_attr(test, macro_use)]
+extern crate lightning;
+
+#[cfg(all(test, not(taproot)))]
+pub mod upgrade_downgrade_tests;

lightning/src/ln/upgrade_downgrade_tests.rs renamed to lightning-tests/src/upgrade_downgrade_tests.rs

@@ -14,8 +14,9 @@ use lightning_0_1::ln::functional_test_utils as lightning_0_1_utils;
 use lightning_0_1::get_monitor as get_monitor_0_1;
 use lightning_0_1::util::ser::Writeable;
 
-use crate::ln::functional_test_utils::*;
-use crate::types::payment::PaymentPreimage;
+use lightning::ln::functional_test_utils::*;
+
+use lightning_types::payment::PaymentPreimage;
 
 #[test]
 fn simple_upgrade() {

lightning/src/ln/functional_test_utils.rs

@@ -1168,7 +1168,7 @@ pub fn _reload_node<'a, 'b, 'c>(node: &'a Node<'a, 'b, 'c>, default_config: User
 	node_deserialized
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
+#[macro_export]
 macro_rules! reload_node {
 	($node: expr, $new_config: expr, $chanman_encoded: expr, $monitors_encoded: expr, $persister: ident, $new_chain_monitor: ident, $new_channelmanager: ident) => {
 		let chanman_encoded = $chanman_encoded;

lightning/src/ln/mod.rs

@@ -99,8 +99,5 @@ mod offers_tests;
 #[cfg(test)]
 #[allow(unused_mut)]
 mod dual_funding_tests;
-#[cfg(all(not(taproot), test))]
-#[allow(unused_mut)]
-mod upgrade_downgrade_tests;
 
 pub use self::peer_channel_encryptor::LN_MAX_MSG_LEN;

lightning/src/onion_message/messenger.rs

@@ -1293,8 +1293,8 @@ where
 		}
 	}
 
-	#[cfg(any(test, feature = "_externalize_tests"))]
-	pub(crate) fn set_offers_handler(&mut self, offers_handler: OMH) {
+	#[cfg(any(test, feature = "_test_utils"))]
+	pub fn set_offers_handler(&mut self, offers_handler: OMH) {
 		self.offers_handler = offers_handler;
 	}