Adding a separate error enum for proof of reserves

Author: ulrichard

.github/workflows/cont_integration.yml

@@ -24,6 +24,7 @@ jobs:
           - compiler
           - rpc
           - verify
+          - reserves
     steps:
       - name: checkout
         uses: actions/checkout@v2

Cargo.toml

@@ -33,7 +33,6 @@ lazy_static = { version = "1.4", optional = true }
 tiny-bip39 = { version = "^0.8", optional = true }
 zeroize = { version = "<1.4.0", optional = true }
 bitcoinconsensus = { version = "0.19.0-3", optional = true }
-bitcoin_hashes = { version = "^0.9", optional = true }
 base64 = { version = "^0.11", optional = true }
 
 # Needed by bdk_blockchain_tests macro
@@ -61,7 +60,7 @@ async-interface = ["async-trait"]
 all-keys = ["keys-bip39"]
 keys-bip39 = ["tiny-bip39", "zeroize"]
 rpc = ["bitcoincore-rpc"]
-reserves = ["bitcoinconsensus", "bitcoin_hashes", "base64"]
+reserves = ["bitcoinconsensus", "base64", "electrum"]
 
 # Debug/Test features
 test-blockchains = ["bitcoincore-rpc", "electrum-client"]

src/error.rs

@@ -63,10 +63,9 @@ pub enum Error {
     },
     /// Node doesn't have data to estimate a fee rate
     FeeRateUnavailable,
-    /// The proof of reserves is invalid. The reason is given in the string parameter.
-    ProofOfReservesInvalid(String),
-    /// Cannot verify the proof.
-    CannotVerifyProof,
+    /// Proof error
+    #[cfg(feature = "reserves")]
+    Proof(crate::wallet::reserves::ProofError),
     /// In order to use the [`TxBuilder::add_global_xpubs`] option every extended
     /// key in the descriptor must either be a master key itself (having depth = 0) or have an
     /// explicit origin provided