From: Steve Myers <steve@notmandatory.org>
Date: Thu, 5 May 2022 23:42:56 +0000 (-0700)
Subject: Change wallet::get_funded_wallet to return Wallet<AnyDatabase>
X-Git-Tag: v0.19.0~12^2
X-Git-Url: http://internal-gitweb-vhost/script/%22https:/%22example_cli/enum.Commands.html/struct.CommandStringError.html?a=commitdiff_plain;h=e7a56a92685ce1948d2ec7232fccd7e072d4abb3;p=bdk

Change wallet::get_funded_wallet to return Wallet<AnyDatabase>
---

diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs
index 75669559..914d1089 100644
--- a/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@ -57,7 +57,7 @@ use utils::{check_nlocktime, check_nsequence_rbf, After, Older, SecpCtx};
 
 use crate::blockchain::{GetHeight, NoopProgress, Progress, WalletSync};
 use crate::database::memory::MemoryDatabase;
-use crate::database::{BatchDatabase, BatchOperations, DatabaseUtils, SyncTime};
+use crate::database::{AnyDatabase, BatchDatabase, BatchOperations, DatabaseUtils, SyncTime};
 use crate::descriptor::derived::AsDerived;
 use crate::descriptor::policy::BuildSatisfaction;
 use crate::descriptor::{
@@ -1613,17 +1613,13 @@ where
 /// Return a fake wallet that appears to be funded for testing.
 pub fn get_funded_wallet(
     descriptor: &str,
-) -> (
-    Wallet<MemoryDatabase>,
-    (String, Option<String>),
-    bitcoin::Txid,
-) {
+) -> (Wallet<AnyDatabase>, (String, Option<String>), bitcoin::Txid) {
     let descriptors = testutils!(@descriptors (descriptor));
     let wallet = Wallet::new(
         &descriptors.0,
         None,
         Network::Regtest,
-        MemoryDatabase::new(),
+        AnyDatabase::Memory(MemoryDatabase::new()),
     )
     .unwrap();