stop using debug_assertions as a feature

Author: joemphilips

bindings/Cargo.toml

@@ -9,13 +9,14 @@ crate-type=["staticlib", "cdylib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[features]
-debug_assertions = ["hex"]
-
 [dependencies]
 lightning = { path = "../lightning" }
 secp256k1 = "0.15"
 bitcoin = "0.21"
 bitcoin_hashes = "0.7"
-hex = { version = "0.3", optional = true }
+# We want to include this only for debug build, but following line does not work.
+# [target.'cfg(debug_assertions)'.dependencies]
+# see https://github.com/rust-lang/cargo/issues/7634
+# as a workaround, we just included it as an usual dependency
+hex = "0.3"
 

bindings/src/broadcaster.rs

@@ -13,20 +13,20 @@ use crate::error::FFIResult;
 
 pub type FFIBroadCasterHandle<'a> = HandleShared<'a, FFIBroadCaster>;
 
-#[cfg(feature = "debug_assertions")]
+#[cfg(debug_assertions)]
 #[repr(C)]
 pub struct BroadcasterWrapper {
     broadcaster: Arc<FFIBroadCaster>,
 }
 
-#[cfg(feature = "debug_assertions")]
+#[cfg(debug_assertions)]
 impl BroadcasterWrapper {
     pub fn broadcast(&self, tx: &Transaction) {
         self.broadcaster.as_ref().broadcast_transaction(&tx)
     }
 }
 
-#[cfg(feature = "debug_assertions")]
+#[cfg(debug_assertions)]
 type BroadcasterWrapperHandle<'a> = HandleShared<'a, BroadcasterWrapper>;
 
 
@@ -46,7 +46,7 @@ ffi! {
 }
 
 /// Useful for testing low-level interoperability.
-#[cfg(feature = "debug_assertions")]
+#[cfg(debug_assertions)]
 ffi! {
     fn ffi_test_broadcaster(broadcaster_ptr: FFIBroadCasterHandle) -> FFIResult {
         let broadcaster = unsafe_block!("" => broadcaster_ptr.as_ref());
@@ -77,4 +77,4 @@ ffi! {
         }))
     }
 
-}
+}

bindings/src/lib.rs

@@ -10,7 +10,7 @@ extern crate bitcoin_hashes;
 extern crate lightning;
 extern crate secp256k1;
 
-#[cfg(feature = "debug_assertions")]
+#[cfg(debug_assertions)]
 extern crate hex;
 
 #[macro_use]
@@ -35,7 +35,7 @@ mod channelmanager;
 mod error;
 mod handle;
 
-#[cfg(feature = "debug_assertions")]
+#[cfg(debug_assertions)]
 mod ffi_test_utils;
 
 pub use handle::*;

bindings/src/logger.rs

@@ -23,7 +23,7 @@ use lightning::util::logger::{Record, Level};
 
 use std::fmt::Arguments;
 /// Useful for testing low-level interoperability.
-#[cfg(feature = "debug_assertions")]
+#[cfg(debug_assertions)]
 ffi! {
     fn test_logger(handle: FFILoggerHandle) -> FFIResult {
         let logger: &FFILogger = unsafe_block!("" => handle.as_ref());