chore: update to upgrade dash core with x11 as a feature (#46)

Author: QuantumExplorer

client/src/client.rs

@@ -28,16 +28,16 @@ use dashcore::{
     Address, Amount, Block, OutPoint, PrivateKey, ProTxHash, PublicKey, QuorumHash, Transaction,
 };
 use dashcore_private::hex::display::DisplayHex;
-use hex::ToHex;
+use dashcore_rpc_json::dashcore::bls_sig_utils::BLSSignature;
 use dashcore_rpc_json::dashcore::{BlockHash, ChainLock};
 use dashcore_rpc_json::{ProTxInfo, ProTxListType, QuorumType};
+use hex::ToHex;
 use log::Level::{Debug, Trace, Warn};
-use dashcore_rpc_json::dashcore::bls_sig_utils::BLSSignature;
 
 use crate::error::*;
-use crate::Error::UnexpectedStructure;
 use crate::json;
 use crate::queryable;
+use crate::Error::UnexpectedStructure;
 
 /// Crate-specific Result type, shorthand for `std::result::Result` with our
 /// crate-specific Error type;
@@ -393,11 +393,17 @@ pub trait RpcApi: Sized {
 
     /// Returns information about the best chainlock.
     fn get_best_chain_lock(&self) -> Result<ChainLock> {
-        let json::GetBestChainLockResult { blockhash, height, signature, known_block: _ } = self.call("getbestchainlock", &[])?;
+        let json::GetBestChainLockResult {
+            blockhash,
+            height,
+            signature,
+            known_block: _,
+        } = self.call("getbestchainlock", &[])?;
 
         Ok(ChainLock {
             block_height: height,
-            signature: BLSSignature::try_from(signature.as_slice()).map_err(|e| UnexpectedStructure(e.to_string()))?,
+            signature: BLSSignature::try_from(signature.as_slice())
+                .map_err(|e| UnexpectedStructure(e.to_string()))?,
             block_hash: blockhash,
         })
     }
@@ -421,7 +427,11 @@ pub trait RpcApi: Sized {
 
     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("change address given by core was not an address".to_string()))?;
+        let address = Address::from_str(&data).map_err(|_e| {
+            Error::UnexpectedStructure(
+                "change address given by core was not an address".to_string(),
+            )
+        })?;
 
         Ok(address)
     }
@@ -442,7 +452,10 @@ pub trait RpcApi: Sized {
         transactions_by_block_hash: BTreeMap<&BlockHash, Vec<&dashcore::Txid>>,
     ) -> Result<BTreeMap<dashcore::Txid, Transaction>> {
         let mut args = [into_json(transactions_by_block_hash)?, into_json(false)?];
-        let list = self.call::<Vec<(dashcore::Txid, Transaction)>>("getrawtransactionmulti", handle_defaults(&mut args, &[null()]))?;
+        let list = self.call::<Vec<(dashcore::Txid, Transaction)>>(
+            "getrawtransactionmulti",
+            handle_defaults(&mut args, &[null()]),
+        )?;
         Ok(list.into_iter().collect())
     }
 
@@ -512,7 +525,7 @@ pub trait RpcApi: Sized {
             .into_iter()
             .map(|index| Ok(into_json(index.to_string())?))
             .collect::<Result<Vec<Value>>>()?;
-        let args = [indices_json.into(),  opt_into_json(height)?];
+        let args = [indices_json.into(), opt_into_json(height)?];
         self.call("getassetunlockstatuses", &args)
     }
 
@@ -1565,12 +1578,12 @@ pub trait RpcApi: Sized {
     /// If the returned height is less than the given chain lock height this means that the chain lock was accepted but we did not yet have the block
     /// If the returned height is equal to the chain lock height given this means that we are at the height of the chain lock
     /// If the returned height is higher that the given chain lock this means that we ignored the chain lock because core had something better.
-    fn submit_chain_lock(
-        &self,
-        chain_lock: &ChainLock,
-    ) -> Result<u32> {
-        let mut args =
-            [into_json(hex::encode(chain_lock.block_hash))?, into_json(hex::encode(chain_lock.signature.as_bytes()))?, into_json(chain_lock.block_height)?];
+    fn submit_chain_lock(&self, chain_lock: &ChainLock) -> Result<u32> {
+        let mut args = [
+            into_json(hex::encode(chain_lock.block_hash))?,
+            into_json(hex::encode(chain_lock.signature.as_bytes()))?,
+            into_json(chain_lock.block_height)?,
+        ];
         self.call::<u32>("submitchainlock", handle_defaults(&mut args, &[null()]))
     }
 

client/src/error.rs

@@ -87,7 +87,9 @@ impl fmt::Display for Error {
             Error::Io(ref e) => write!(f, "I/O error: {}", e),
             Error::InvalidAmount(ref e) => write!(f, "invalid amount: {}", e),
             Error::InvalidCookieFile => write!(f, "invalid cookie file"),
-            Error::UnexpectedStructure(ref e) => write!(f, "the JSON result had an unexpected structure: {}", e),
+            Error::UnexpectedStructure(ref e) => {
+                write!(f, "the JSON result had an unexpected structure: {}", e)
+            }
         }
     }
 }