From: Matt Corallo <git@bluematt.me>
Date: Tue, 27 Mar 2018 15:18:10 +0000 (-0400)
Subject: Make Channel non-public except in fuzztarget mode, bump version
X-Git-Tag: v0.0.12~415^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=refs%2Fheads%2F2017-04-channel-close;p=rust-lightning

Make Channel non-public except in fuzztarget mode, bump version
---

diff --git a/Cargo.toml b/Cargo.toml
index 3e07441c1..8e1946b1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lightning"
-version = "0.0.1"
+version = "0.0.2"
 authors = ["Matt Corallo"]
 license = "Apache-2.0"
 repository = "https://github.com/TheBlueMatt/rust-lightning/"
diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index 8be2348a7..ff78a27df 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -41,8 +41,8 @@ pub struct PendingForwardHTLCInfo {
 	amt_to_forward: u64,
 	outgoing_cltv_value: u32,
 }
-//TODO: This is public, and needed to call Channel::update_add_htlc, so there needs to be a way to
-//initialize it usefully...probably make it optional in Channel instead).
+
+#[cfg(feature = "fuzztarget")]
 impl PendingForwardHTLCInfo {
 	pub fn dummy() -> Self {
 		Self {
@@ -635,7 +635,7 @@ impl ChannelManager {
 			let mut channel_state_lock = self.channel_state.lock().unwrap();
 			let channel_state = channel_state_lock.borrow_parts();
 
-			if Instant::now() < *channel_state.next_forward {
+			if cfg!(not(feature = "fuzztarget")) && Instant::now() < *channel_state.next_forward {
 				return;
 			}
 
diff --git a/src/ln/mod.rs b/src/ln/mod.rs
index 1f5fa460a..7cd4272e1 100644
--- a/src/ln/mod.rs
+++ b/src/ln/mod.rs
@@ -1,9 +1,13 @@
 pub mod channelmanager;
-pub mod channel;
 pub mod channelmonitor;
 pub mod msgs;
 pub mod router;
 pub mod peer_channel_encryptor;
 pub mod peer_handler;
 
+#[cfg(feature = "fuzztarget")]
+pub mod channel;
+#[cfg(not(feature = "fuzztarget"))]
+pub(crate) mod channel;
+
 mod chan_utils;