Update lightning-transaction-sync to use macros crate

Author: tnull

lightning-macros/src/lib.rs

@@ -21,30 +21,7 @@
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::spanned::Spanned;
-use syn::{parse, ImplItemFn, ItemImpl, ItemTrait, Token};
-
-fn add_async_trait(mut parsed: ItemTrait) -> TokenStream {
-	let output = quote! {
-		#[cfg(not(feature = "async-interface"))]
-		#parsed
-	};
-
-	for mut item in &mut parsed.items {
-		if let syn::TraitItem::Fn(f) = &mut item {
-			f.sig.asyncness = Some(Token![async](f.span()));
-		}
-	}
-
-	let output = quote! {
-		#output
-
-		#[cfg(feature = "async-interface")]
-		#[async_trait(?Send)]
-		#parsed
-	};
-
-	output.into()
-}
+use syn::{parse, ImplItemFn, Token};
 
 fn add_async_method(mut parsed: ImplItemFn) -> TokenStream {
 	let output = quote! {
@@ -64,44 +41,14 @@ fn add_async_method(mut parsed: ImplItemFn) -> TokenStream {
 	output.into()
 }
 
-fn add_async_impl_trait(mut parsed: ItemImpl) -> TokenStream {
-	let output = quote! {
-		#[cfg(not(feature = "async-interface"))]
-		#parsed
-	};
-
-	for mut item in &mut parsed.items {
-		if let syn::ImplItem::Fn(f) = &mut item {
-			f.sig.asyncness = Some(Token![async](f.span()));
-		}
-	}
-
-	let output = quote! {
-		#output
-
-		#[cfg(feature = "async-interface")]
-		#[async_trait(?Send)]
-		#parsed
-	};
-
-	output.into()
-}
-
-/// Makes a method or every method of a trait `async`, if the `async-interface` feature is enabled.
-///
-/// Requires the `async-trait` crate as a dependency whenever this attribute is used on a trait
-/// definition or trait implementation.
+/// Makes a method `async`, if the `async-interface` feature is enabled.
 #[proc_macro_attribute]
 pub fn maybe_async(_attr: TokenStream, item: TokenStream) -> TokenStream {
-	if let Ok(parsed) = parse(item.clone()) {
-		add_async_trait(parsed)
-	} else if let Ok(parsed) = parse(item.clone()) {
+	if let Ok(parsed) = parse(item) {
 		add_async_method(parsed)
-	} else if let Ok(parsed) = parse(item) {
-		add_async_impl_trait(parsed)
 	} else {
 		(quote! {
-			compile_error!("#[maybe_async] can only be used on methods, trait or trait impl blocks")
+			compile_error!("#[maybe_async] can only be used on methods")
 		})
 		.into()
 	}

lightning-transaction-sync/Cargo.toml

@@ -24,8 +24,8 @@ async-interface = []
 
 [dependencies]
 lightning = { version = "0.0.124", path = "../lightning", default-features = false, features = ["std"] }
+lightning-macros = { version = "0.1", path = "../lightning-macros", default-features = false }
 bitcoin = { version = "0.32.2", default-features = false }
-bdk-macros = "0.6"
 futures = { version = "0.3", optional = true }
 esplora-client = { version = "0.9", default-features = false, optional = true }
 electrum-client = { version = "0.21.0", optional = true }

lightning-transaction-sync/src/esplora.rs

@@ -13,6 +13,8 @@ use lightning::chain::{Confirm, Filter};
 use lightning::util::logger::Logger;
 use lightning::{log_debug, log_error, log_trace};
 
+use lightning_macros::{maybe_async, maybe_await};
+
 use bitcoin::{BlockHash, Script, Txid};
 
 #[cfg(not(feature = "async-interface"))]

lightning-transaction-sync/src/lib.rs

@@ -71,10 +71,6 @@
 #![deny(unsafe_code)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
-#[cfg(any(feature = "esplora-blocking", feature = "esplora-async"))]
-#[macro_use]
-extern crate bdk_macros;
-
 #[cfg(any(feature = "esplora-blocking", feature = "esplora-async"))]
 mod esplora;
 

lightning-transaction-sync/tests/integration_tests.rs

@@ -11,7 +11,8 @@ use lightning_transaction_sync::ElectrumSyncClient;
 #[cfg(any(feature = "esplora-blocking", feature = "esplora-async"))]
 use lightning_transaction_sync::EsploraSyncClient;
 
-use bdk_macros::maybe_await;
+use lightning_macros::maybe_await;
+
 use bitcoin::block::Header;
 use bitcoin::constants::genesis_block;
 use bitcoin::network::Network;