From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Thu, 26 Aug 2021 15:14:31 +0000 (+0200)
Subject: Makes send_raw_transaction return Txid instead of RawTx
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=2bd0d81d407506d05901c3ac204fcbe3f8da34e9;p=ldk-sample

Makes send_raw_transaction return Txid instead of RawTx

'bitcoind_client::send_raw_transaction' was returning 'RawTx' which, while syntactically correct (it's a wrapper around String), made no sense conceptually.

Since rust-bitcoin/rust-lightning@f65d05c, `Txid` can be used instead.
---

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index 61e67c2..73ee635 100644
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -3,7 +3,7 @@ use base64;
 use bitcoin::blockdata::block::Block;
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::consensus::encode;
-use bitcoin::hash_types::BlockHash;
+use bitcoin::hash_types::{BlockHash, Txid};
 use bitcoin::util::address::Address;
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning_block_sync::http::HttpEndpoint;
@@ -206,7 +206,7 @@ impl BitcoindClient {
 		let mut rpc = self.bitcoind_rpc_client.lock().await;
 
 		let raw_tx_json = serde_json::json!(raw_tx.0);
-		rpc.call_method::<RawTx>("sendrawtransaction", &[raw_tx_json]).await.unwrap();
+		rpc.call_method::<Txid>("sendrawtransaction", &[raw_tx_json]).await.unwrap();
 	}
 
 	pub async fn sign_raw_transaction_with_wallet(&self, tx_hex: String) -> SignedTx {
@@ -254,7 +254,7 @@ impl BroadcasterInterface for BitcoindClient {
 			let mut rpc = bitcoind_rpc_client.lock().await;
 			// This may error due to RL calling `broadcast_transaction` with the same transaction
 			// multiple times, but the error is safe to ignore.
-			match rpc.call_method::<RawTx>("sendrawtransaction", &vec![tx_serialized]).await {
+			match rpc.call_method::<Txid>("sendrawtransaction", &vec![tx_serialized]).await {
 				Ok(_) => {}
 				Err(e) => {
 					let err_str = e.get_ref().unwrap().to_string();