Unify TxOut naming

Author: sgeisler

client/src/client.rs

@@ -1015,10 +1015,10 @@ pub trait RpcApi: Sized {
         self.call("uptime", &[])
     }
 
-    fn scan_txout_set_blocking(
+    fn scan_tx_out_set_blocking(
         &self,
-        descriptors: &[json::ScanTxoutRequest],
-    ) -> Result<json::ScanTxoutResult> {
+        descriptors: &[json::ScanTxOutRequest],
+    ) -> Result<json::ScanTxOutResult> {
         self.call("scantxoutset", &["start".into(), into_json(descriptors)?])
     }
 }

integration_test/src/main.rs

@@ -30,7 +30,7 @@ use bitcoin::{
     Address, Amount, Network, OutPoint, PrivateKey, Script, SigHashType, SignedAmount, Transaction,
     TxIn, TxOut, Txid,
 };
-use bitcoincore_rpc::bitcoincore_rpc_json::ScanTxoutRequest;
+use bitcoincore_rpc::bitcoincore_rpc_json::ScanTxOutRequest;
 
 lazy_static! {
     static ref SECP: secp256k1::Secp256k1<secp256k1::All> = secp256k1::Secp256k1::new();
@@ -925,8 +925,9 @@ fn test_scantxoutset(cl: &Client) {
     cl.generate_to_address(2, &addr).unwrap();
     cl.generate_to_address(7, &cl.get_new_address(None, None).unwrap()).unwrap();
 
-    let utxos =
-        cl.scan_txout_set_blocking(&[ScanTxoutRequest::Single(format!("addr({})", addr))]).unwrap();
+    let utxos = cl
+        .scan_tx_out_set_blocking(&[ScanTxOutRequest::Single(format!("addr({})", addr))])
+        .unwrap();
 
     assert_eq!(utxos.unspents.len(), 2);
     assert_eq!(utxos.success, Some(true));

json/src/lib.rs

@@ -1256,7 +1256,7 @@ pub enum PubKeyOrAddress<'a> {
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 #[serde(untagged)]
 /// Start a scan of the UTXO set for an [output descriptor](https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md).
-pub enum ScanTxoutRequest {
+pub enum ScanTxOutRequest {
     /// Scan for a single descriptor
     Single(String),
     /// Scan for a descriptor with xpubs
@@ -1269,7 +1269,7 @@ pub enum ScanTxoutRequest {
 }
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
-pub struct ScanTxoutResult {
+pub struct ScanTxOutResult {
     pub success: Option<bool>,
     #[serde(rename = "txouts")]
     pub tx_outs: Option<u64>,