NIH the delegate macro

Author: devrandom

lightning/Cargo.toml

@@ -17,7 +17,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 # Internal test utilities exposed to other repo crates
-_test_utils = ["regex", "bitcoin/bitcoinconsensus", "lightning-types/_test_utils", "delegate"]
+_test_utils = ["regex", "bitcoin/bitcoinconsensus", "lightning-types/_test_utils"]
 _externalize_tests = ["inventory", "_test_utils"]
 # Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
 # This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
@@ -48,14 +48,12 @@ regex = { version = "1.5.6", optional = true }
 backtrace = { version = "0.3", optional = true }
 
 libm = { version = "0.2", default-features = false }
-delegate = { version = "0.13.1", optional = true }
 inventory = { version = "0.3", optional = true  }
 
 [dev-dependencies]
 regex = "1.5.6"
 lightning-types = { version = "0.3.0", path = "../lightning-types", features = ["_test_utils"] }
 lightning-macros = { path = "../lightning-macros" }
-delegate = { version = "0.13.1" }
 
 [dev-dependencies.bitcoin]
 version = "0.32.2"

lightning/src/ln/channel.rs

@@ -1187,7 +1187,7 @@ impl<SP: Deref> Channel<SP> where
 		}
 	}
 
-	#[cfg(test)]
+	#[cfg(any(test, feature = "_externalize_tests"))]
 	pub fn funding_mut(&mut self) -> &mut FundingScope {
 		match &mut self.phase {
 			ChannelPhase::Undefined => unreachable!(),
@@ -1569,9 +1569,9 @@ pub(super) struct FundingScope {
 	/// minimum channel reserve for self to maintain - set by them.
 	counterparty_selected_channel_reserve_satoshis: Option<u64>,
 
-	#[cfg(test)]
+	#[cfg(any(test, feature = "_externalize_tests"))]
 	pub(super) holder_selected_channel_reserve_satoshis: u64,
-	#[cfg(not(test))]
+	#[cfg(not(any(test, feature = "_externalize_tests")))]
 	holder_selected_channel_reserve_satoshis: u64,
 
 	#[cfg(debug_assertions)]