Update bdk dependency to 0.22

Author: notmandatory

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bdk-reserves"
-version = "0.20.0"
+version = "0.22.0"
 authors = ["Richard Ulrich <richard.ulrich@seba.swiss>"]
 edition = "2018"
 description = "Proof of reserves for bitcoin dev kit"
@@ -9,12 +9,15 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/weareseba/bdk-reserves"
 
+[patch.crates-io]
+bdk = { git = "https://github.com/bitcoindevkit/bdk", tag = "0.22.0-rc.1"}
+
 [dependencies]
-bdk = { version = "0.20", default-features = false }
+bdk = { version = "0.22.0-rc.1", default-features = false }
 bitcoinconsensus = "0.19.0-3"
 log = "^0.4"
 
 [dev-dependencies]
 rstest = "^0.11"
 bdk-testutils = "^0.4"
-bdk = { version = "0.20", default-features = true }
+bdk = { version = "0.22.0-rc.1", default-features = true }

tests/mempool.rs

@@ -28,7 +28,11 @@ fn unconfirmed() -> Result<(), ProofError> {
     )?;
 
     let balance = wallet.get_balance()?;
-    assert!(balance > 10_000, "insufficient balance: {}", balance);
+    assert!(
+        balance.confirmed > 10_000,
+        "insufficient balance: {}",
+        balance.confirmed
+    );
     let addr = wallet.get_address(AddressIndex::New).unwrap();
     assert_eq!(
         addr.to_string(),
@@ -58,7 +62,7 @@ fn unconfirmed() -> Result<(), ProofError> {
     assert!(finalized);
 
     let spendable = wallet.verify_proof(&psbt, message, None)?;
-    assert_eq!(spendable, new_balance);
+    assert_eq!(spendable, new_balance.confirmed);
 
     Ok(())
 }
@@ -73,7 +77,11 @@ fn confirmed() {
     .unwrap();
 
     let balance = wallet.get_balance().unwrap();
-    assert!(balance > 10_000, "insufficient balance: {}", balance);
+    assert!(
+        balance.confirmed > 10_000,
+        "insufficient balance: {}",
+        balance
+    );
     let addr = wallet.get_address(AddressIndex::New).unwrap();
     assert_eq!(
         addr.to_string(),
@@ -109,5 +117,5 @@ fn confirmed() {
     let spendable = wallet
         .verify_proof(&psbt, message, Some(max_confirmation_height))
         .unwrap();
-    assert_eq!(spendable, new_balance);
+    assert_eq!(spendable, new_balance.confirmed);
 }

tests/multi_sig.rs

@@ -96,7 +96,7 @@ fn test_proof_multisig(
     );
     let balance = wallet1.get_balance()?;
     assert!(
-        (410000..=420000).contains(&balance),
+        (410000..=420000).contains(&balance.confirmed),
         "balance is {} but should be between 410000 and 420000",
         balance
     );
@@ -158,7 +158,7 @@ fn test_proof_multisig(
     assert!(finalized);
 
     let spendable = wallet1.verify_proof(&psbt, message, None)?;
-    assert_eq!(spendable, balance);
+    assert_eq!(spendable, balance.confirmed);
 
     Ok(())
 }

tests/single_sig.rs

@@ -36,7 +36,7 @@ fn test_proof(#[case] descriptor: &'static str) -> Result<(), ProofError> {
     assert!(finalized);
 
     let spendable = wallet.verify_proof(&psbt, message, None)?;
-    assert_eq!(spendable, balance);
+    assert_eq!(spendable, balance.confirmed);
 
     Ok(())
 }

tests/tampering.rs

@@ -22,7 +22,7 @@ fn tampered_proof_message() {
     let spendable = wallet
         .verify_proof(&psbt_alice, message_alice, None)
         .unwrap();
-    assert_eq!(spendable, balance);
+    assert_eq!(spendable, balance.confirmed);
 
     // change the message
     let message_bob = "This belongs to Bob.";