Rename some fields for readability

Author: GideonBature

types/src/v18/blockchain/into.rs

@@ -95,7 +95,7 @@ impl ScanTxOutSetUnspent {
             txid,
             vout: self.vout,
             script_pubkey,
-            desc: Some(self.desc),
+            desc: Some(self.descriptor),
             amount,
             coinbase: None,
             height: self.height,

types/src/v19/blockchain/into.rs

@@ -242,7 +242,7 @@ impl ScanTxOutSetStart {
     pub fn into_model(self) -> Result<model::ScanTxOutSetStart, ScanTxOutSetError> {
         use ScanTxOutSetError as E;
 
-        let bestblock = self.bestblock.parse::<BlockHash>().map_err(E::BestBlockHash)?;
+        let bestblock = self.best_block.parse::<BlockHash>().map_err(E::BestBlockHash)?;
 
         let unspents =
             self.unspents.into_iter().map(|u| u.into_model()).collect::<Result<Vec<_>, _>>()?;
@@ -272,7 +272,7 @@ impl ScanTxOutSetUnspent {
             txid,
             vout: self.vout,
             script_pubkey,
-            desc: Some(self.desc),
+            desc: Some(self.descriptor),
             amount,
             coinbase: None,
             height: self.height,

types/src/v25/blockchain/into.rs

@@ -67,7 +67,7 @@ impl ScanTxOutSetStart {
     pub fn into_model(self) -> Result<model::ScanTxOutSetStart, ScanTxOutSetError> {
         use ScanTxOutSetError as E;
 
-        let bestblock = self.bestblock.parse::<BlockHash>().map_err(E::BestBlockHash)?;
+        let bestblock = self.best_block.parse::<BlockHash>().map_err(E::BestBlockHash)?;
 
         let unspents =
             self.unspents.into_iter().map(|u| u.into_model()).collect::<Result<Vec<_>, _>>()?;
@@ -97,7 +97,7 @@ impl ScanTxOutSetUnspent {
             txid,
             vout: self.vout,
             script_pubkey,
-            desc: Some(self.desc),
+            desc: Some(self.descriptor),
             amount,
             coinbase: Some(self.coinbase),
             height: self.height,

types/src/v28/blockchain/into.rs

@@ -9,15 +9,10 @@ impl ScanTxOutSetStart {
     pub fn into_model(self) -> Result<model::ScanTxOutSetStart, ScanTxOutSetError> {
         use ScanTxOutSetError as E;
 
-        let bestblock = self
-            .bestblock
-            .parse::<BlockHash>().map_err(E::BestBlockHash)?;
+        let bestblock = self.best_block.parse::<BlockHash>().map_err(E::BestBlockHash)?;
 
-        let unspents = self
-            .unspents
-            .into_iter()
-            .map(|u| u.into_model())
-            .collect::<Result<Vec<_>, _>>()?;
+        let unspents =
+            self.unspents.into_iter().map(|u| u.into_model()).collect::<Result<Vec<_>, _>>()?;
 
         let total_amount = Amount::from_btc(self.total_amount).map_err(E::TotalAmount)?;
 
@@ -39,15 +34,13 @@ impl ScanTxOutSetUnspent {
         let txid = self.txid.parse::<Txid>().map_err(E::Txid)?;
         let amount = Amount::from_btc(self.amount).map_err(E::Amount)?;
         let script_pubkey = ScriptBuf::from_hex(&self.script_pubkey).map_err(E::ScriptPubKey)?;
-        let blockhash = self
-            .blockhash
-            .parse::<BlockHash>().map_err(E::BlockHash)?;
+        let blockhash = self.block_hash.parse::<BlockHash>().map_err(E::BlockHash)?;
 
         Ok(model::ScanTxOutSetUnspent {
             txid,
             vout: self.vout,
             script_pubkey,
-            desc: Some(self.desc),
+            desc: Some(self.descriptor),
             amount,
             coinbase: Some(self.coinbase),
             height: self.height,