Replace cargo features with cfg-flags

Author: G8XSU

Cargo.toml

@@ -30,8 +30,6 @@ panic = 'abort'     # Abort on panic
 
 [features]
 default = []
-vss = []
-vss-test = []
 
 [dependencies]
 lightning = { version = "0.0.118", features = ["max_level_trace", "std"] }

src/builder.rs

@@ -48,7 +48,7 @@ use bip39::Mnemonic;
 
 use bitcoin::BlockHash;
 
-#[cfg(feature = "vss")]
+#[cfg(any(vss, vss_test))]
 use crate::io::vss_store::VssStore;
 use std::convert::TryInto;
 use std::default::Default;
@@ -273,7 +273,7 @@ impl NodeBuilder {
 
 	/// Builds a [`Node`] instance with a [`VssStore`] backend and according to the options
 	/// previously configured.
-	#[cfg(feature = "vss")]
+	#[cfg(any(vss, vss_test))]
 	pub fn build_with_vss_store(
 		&self, url: &str, store_id: String,
 	) -> Result<Node<VssStore>, BuildError> {

src/io/vss_store.rs

@@ -21,7 +21,7 @@ pub struct VssStore {
 }
 
 impl VssStore {
-	#[cfg(feature = "vss")]
+	#[cfg(any(vss, vss_test))]
 	pub(crate) fn new(base_url: &str, store_id: String) -> Self {
 		let client = VssClient::new(base_url);
 		let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap();
@@ -182,7 +182,7 @@ impl KVStore for VssStore {
 impl RefUnwindSafe for VssStore {}
 
 #[cfg(test)]
-#[cfg(feature = "vss-test")]
+#[cfg(vss_test)]
 mod tests {
 	use super::*;
 	use crate::io::test_utils::do_read_write_remove_list_persist;

src/test/functional_tests.rs

@@ -19,7 +19,7 @@ fn channel_full_cycle() {
 }
 
 #[test]
-#[cfg(feature = "vss-test")]
+#[cfg(vss_test)]
 fn channel_full_cycle_with_vss_store() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
 	println!("== Node A ==");