feat: get_raw_change_address (#38)

Author: lklimek

client/src/client.rs

@@ -10,9 +10,9 @@
 
 use std::collections::HashMap;
 use std::fs::File;
-use std::io::Read;
 use std::iter::FromIterator;
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::{fmt, result};
 
 use crate::dashcore;
@@ -21,7 +21,6 @@ use serde;
 use serde_json::{self, Value};
 
 use crate::dashcore::address::NetworkUnchecked;
-use crate::dashcore::amount::serde::SerdeAmount;
 use crate::dashcore::{block, consensus, ScriptBuf};
 use dashcore::hashes::hex::FromHex;
 use dashcore::secp256k1::ecdsa::Signature;
@@ -411,6 +410,13 @@ pub trait RpcApi: Sized {
         self.call("getblockstats", &[height.into(), fields.into()])
     }
 
+    fn get_raw_change_address(&self) -> Result<Address<NetworkUnchecked>> {
+        let data: String = self.call("getrawchangeaddress", &[])?;
+        let address = Address::from_str(&data).map_err(|_e| Error::UnexpectedStructure)?;
+
+        Ok(address)
+    }
+
     fn get_raw_transaction(
         &self,
         txid: &dashcore::Txid,
@@ -670,11 +676,7 @@ pub trait RpcApi: Sized {
         let outs_converted = serde_json::Map::from_iter(
             outs.iter().map(|(k, v)| (k.clone(), serde_json::Value::from(v.to_dash()))),
         );
-        let mut args = [
-            into_json(utxos)?,
-            into_json(outs_converted)?,
-            opt_into_json(locktime)?,
-        ];
+        let mut args = [into_json(utxos)?, into_json(outs_converted)?, opt_into_json(locktime)?];
         let defaults = [into_json(0i64)?, null()];
         self.call("createrawtransaction", handle_defaults(&mut args, &defaults))
     }

integration_test/src/main.rs

@@ -301,9 +301,9 @@ fn test_wallet_node_endpoints(wallet_client: &Client) {
     test_list_unspent(wallet_client);
     test_get_difficulty(wallet_client);
     test_get_connection_count(wallet_client);
+    test_get_raw_change_address(wallet_client);
     test_get_raw_transaction(wallet_client);
     test_get_raw_mempool(wallet_client);
-    test_get_transaction(wallet_client);
     test_list_transactions(wallet_client);
     test_list_since_block(wallet_client);
     test_get_tx_out(wallet_client);
@@ -637,6 +637,12 @@ fn test_get_connection_count(cl: &Client) {
     let _ = cl.get_connection_count().unwrap();
 }
 
+
+fn test_get_raw_change_address(cl: &Client) {
+    let address = cl.get_raw_change_address().unwrap();
+    assert!(address.is_valid_for_network(*NET));
+}
+
 fn test_get_raw_transaction(cl: &Client) {
     let addr = cl.get_new_address(None).unwrap()
         .require_network(*NET).unwrap();
@@ -663,17 +669,6 @@ fn test_get_raw_mempool(cl: &Client) {
     let _ = cl.get_raw_mempool().unwrap();
 }
 
-fn test_get_transaction(cl: &Client) {
-    let txid =
-        cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None, None, None).unwrap();
-    let tx = cl.get_transaction(&txid, None).unwrap();
-    assert_eq!(tx.amount, sbtc(-1.0));
-    assert_eq!(tx.txid, Some(txid));
-
-    let fake = Txid::hash(&[1, 2]);
-    assert!(cl.get_transaction(&fake, Some(true)).is_err());
-}
-
 fn test_list_transactions(cl: &Client) {
     let _ = cl.list_transactions(None, None, None, None).unwrap();
     let _ = cl.list_transactions(Some("l"), None, None, None).unwrap();