feat: use test utilities for network persist test

Also removed previous tests.

Author: 110CodingP

src/lib.rs

@@ -914,21 +914,6 @@ mod test {
         Store::new(db, wallet_name.to_string()).unwrap()
     }
 
-    #[test]
-    fn test_network_persistence() {
-        let tmpfile = NamedTempFile::new().unwrap();
-        let db = create_db(tmpfile.path());
-        let store = create_test_store(Arc::new(db), "wallet1");
-        store.create_network_table().unwrap();
-        let network_changeset = Some(Network::Bitcoin);
-        store.persist_network(&network_changeset).unwrap();
-
-        let mut network_changeset = Some(Network::Regtest);
-        store.read_network(&mut network_changeset).unwrap();
-
-        assert_eq!(network_changeset, Some(Network::Bitcoin));
-    }
-
     #[test]
     fn test_keychains_persistence() {
         let tmpfile = NamedTempFile::new().unwrap();
@@ -1700,68 +1685,7 @@ mod test {
         assert_eq!(anchors_read_new, anchors);
     }
 
-    #[test]
-    fn test_tx_graph_persistence() {
-        let tmpfile = NamedTempFile::new().unwrap();
-        let db = create_db(tmpfile.path());
-        let store = create_test_store(Arc::new(db), "wallet1");
-        let tx1 = Arc::new(create_one_inp_one_out_tx(
-            Txid::from_byte_array([0; 32]),
-            30_000,
-        ));
-        let tx2 = Arc::new(create_one_inp_one_out_tx(tx1.compute_txid(), 20_000));
-        let block_id = block_id!(100, "B");
-
-        let conf_anchor: ConfirmationBlockTime = ConfirmationBlockTime {
-            block_id,
-            confirmation_time: 1,
-        };
-
-        let mut tx_graph_changeset1 = tx_graph::ChangeSet::<ConfirmationBlockTime> {
-            txs: [tx1.clone()].into(),
-            txouts: [].into(),
-            anchors: [(conf_anchor, tx1.compute_txid())].into(),
-            last_seen: [(tx1.compute_txid(), 100)].into(),
-            first_seen: [(tx1.compute_txid(), 50)].into(),
-            last_evicted: [(tx1.compute_txid(), 150)].into(),
-        };
-
-        store
-            .create_tx_graph_tables::<ConfirmationBlockTime>()
-            .unwrap();
-
-        store.persist_tx_graph(&tx_graph_changeset1).unwrap();
-
-        let mut changeset = tx_graph::ChangeSet::default();
-        store.read_tx_graph(&mut changeset).unwrap();
-        assert_eq!(changeset, tx_graph_changeset1);
-
-        let block_id = block_id!(101, "REDB");
-
-        let conf_anchor: ConfirmationBlockTime = ConfirmationBlockTime {
-            block_id,
-            confirmation_time: 1,
-        };
-
-        let tx_graph_changeset2 = tx_graph::ChangeSet::<ConfirmationBlockTime> {
-            txs: [tx2.clone()].into(),
-            txouts: [].into(),
-            anchors: [(conf_anchor, tx2.compute_txid())].into(),
-            last_seen: [(tx2.compute_txid(), 200)].into(),
-            first_seen: [(tx2.compute_txid(), 100)].into(),
-            last_evicted: [(tx2.compute_txid(), 150)].into(),
-        };
-
-        store.persist_tx_graph(&tx_graph_changeset2).unwrap();
-
-        let mut changeset = tx_graph::ChangeSet::default();
-        store.read_tx_graph(&mut changeset).unwrap();
-
-        tx_graph_changeset1.merge(tx_graph_changeset2);
-
-        assert_eq!(tx_graph_changeset1, changeset);
-    }
-
+    
     fn parse_descriptor(descriptor: &str) -> Descriptor<DescriptorPublicKey> {
         let secp = bdk_chain::bitcoin::secp256k1::Secp256k1::signing_only();
         Descriptor::<DescriptorPublicKey>::parse_descriptor(&secp, descriptor)
@@ -1890,188 +1814,6 @@ mod test {
         assert_eq!(spk_cache, spk_cache_read_new);
     }
 
-    #[test]
-    fn test_indexer_persistence() {
-        let tmpfile = NamedTempFile::new().unwrap();
-        let db = create_db(tmpfile.path());
-        let store = create_test_store(Arc::new(db), "wallet1");
-
-        let descriptor_ids = utils::DESCRIPTORS.map(|d| parse_descriptor(d).descriptor_id());
-
-        let mut keychain_txout_changeset = keychain_txout::ChangeSet {
-            last_revealed: [(descriptor_ids[0], 1), (descriptor_ids[1], 100)].into(),
-            spk_cache: [
-                (
-                    descriptor_ids[0],
-                    [(0u32, ScriptBuf::from_bytes(vec![1, 2, 3]))].into(),
-                ),
-                (
-                    descriptor_ids[1],
-                    [
-                        (100u32, ScriptBuf::from_bytes(vec![3])),
-                        (1000u32, ScriptBuf::from_bytes(vec![5, 6, 8])),
-                    ]
-                    .into(),
-                ),
-            ]
-            .into(),
-        };
-
-        store.create_indexer_tables().unwrap();
-        store.persist_indexer(&keychain_txout_changeset).unwrap();
-
-        let mut changeset = keychain_txout::ChangeSet::default();
-        store.read_indexer(&mut changeset).unwrap();
-
-        let keychain_txout_changeset_new = keychain_txout::ChangeSet {
-            last_revealed: [(descriptor_ids[0], 2)].into(),
-            spk_cache: [(
-                descriptor_ids[0],
-                [(1u32, ScriptBuf::from_bytes(vec![1, 2, 3]))].into(),
-            )]
-            .into(),
-        };
-
-        store
-            .persist_indexer(&keychain_txout_changeset_new)
-            .unwrap();
-
-        let mut changeset_new = keychain_txout::ChangeSet::default();
-        store.read_indexer(&mut changeset_new).unwrap();
-        keychain_txout_changeset.merge(keychain_txout_changeset_new);
-
-        assert_eq!(changeset_new, keychain_txout_changeset);
-    }
-
-    #[cfg(feature = "wallet")]
-    #[test]
-    fn test_persist_wallet() {
-        let tmpfile = NamedTempFile::new().unwrap();
-        let db = Arc::new(create_db(tmpfile.path()));
-        let store = create_test_store(db, "wallet1");
-
-        let descriptor: Descriptor<DescriptorPublicKey> = DESCRIPTORS[0].parse().unwrap();
-        let change_descriptor: Descriptor<DescriptorPublicKey> = DESCRIPTORS[1].parse().unwrap();
-
-        let mut blocks: BTreeMap<u32, Option<BlockHash>> = BTreeMap::new();
-        blocks.insert(0u32, Some(hash!("B")));
-        blocks.insert(1u32, Some(hash!("T")));
-        blocks.insert(2u32, Some(hash!("C")));
-        let local_chain_changeset = local_chain::ChangeSet { blocks };
-
-        let tx1 = Arc::new(create_one_inp_one_out_tx(
-            Txid::from_byte_array([0; 32]),
-            30_000,
-        ));
-        let tx2 = Arc::new(create_one_inp_one_out_tx(tx1.compute_txid(), 20_000));
-
-        let block_id = block_id!(1, "BDK");
-
-        let conf_anchor: ConfirmationBlockTime = ConfirmationBlockTime {
-            block_id,
-            confirmation_time: 123,
-        };
-
-        let tx_graph_changeset = tx_graph::ChangeSet::<ConfirmationBlockTime> {
-            txs: [tx1.clone()].into(),
-            txouts: [].into(),
-            anchors: [(conf_anchor, tx1.compute_txid())].into(),
-            last_seen: [(tx1.compute_txid(), 100)].into(),
-            first_seen: [(tx1.compute_txid(), 80)].into(),
-            last_evicted: [(tx1.compute_txid(), 150)].into(),
-        };
-
-        let keychain_txout_changeset = keychain_txout::ChangeSet {
-            last_revealed: [
-                (descriptor.descriptor_id(), 12),
-                (change_descriptor.descriptor_id(), 10),
-            ]
-            .into(),
-            spk_cache: [
-                (
-                    descriptor.descriptor_id(),
-                    [(0u32, ScriptBuf::from_bytes(vec![245, 123, 112]))].into(),
-                ),
-                (
-                    change_descriptor.descriptor_id(),
-                    [
-                        (100u32, ScriptBuf::from_bytes(vec![145, 234, 98])),
-                        (1000u32, ScriptBuf::from_bytes(vec![5, 6, 8])),
-                    ]
-                    .into(),
-                ),
-            ]
-            .into(),
-        };
-
-        let mut changeset = ChangeSet {
-            descriptor: Some(descriptor.clone()),
-            change_descriptor: Some(change_descriptor.clone()),
-            network: Some(Network::Bitcoin),
-            local_chain: local_chain_changeset,
-            tx_graph: tx_graph_changeset,
-            indexer: keychain_txout_changeset,
-        };
-
-        store.create_tables::<ConfirmationBlockTime>().unwrap();
-
-        store.persist_wallet(&changeset).unwrap();
-        let mut changeset_read = ChangeSet::default();
-        store.read_wallet(&mut changeset_read).unwrap();
-
-        assert_eq!(changeset, changeset_read);
-
-        let mut blocks: BTreeMap<u32, Option<BlockHash>> = BTreeMap::new();
-        blocks.insert(4u32, Some(hash!("RE")));
-        blocks.insert(5u32, Some(hash!("DB")));
-        let local_chain_changeset = local_chain::ChangeSet { blocks };
-
-        let block_id = block_id!(2, "Bitcoin");
-
-        let conf_anchor: ConfirmationBlockTime = ConfirmationBlockTime {
-            block_id,
-            confirmation_time: 214,
-        };
-
-        let tx_graph_changeset = tx_graph::ChangeSet::<ConfirmationBlockTime> {
-            txs: [tx2.clone()].into(),
-            txouts: [].into(),
-            anchors: [(conf_anchor, tx2.compute_txid())].into(),
-            last_seen: [(tx2.compute_txid(), 200)].into(),
-            first_seen: [(tx2.compute_txid(), 160)].into(),
-            last_evicted: [(tx2.compute_txid(), 300)].into(),
-        };
-
-        let keychain_txout_changeset = keychain_txout::ChangeSet {
-            last_revealed: [(descriptor.descriptor_id(), 14)].into(),
-            spk_cache: [(
-                change_descriptor.descriptor_id(),
-                [
-                    (102u32, ScriptBuf::from_bytes(vec![8, 45, 78])),
-                    (1001u32, ScriptBuf::from_bytes(vec![29, 56, 47])),
-                ]
-                .into(),
-            )]
-            .into(),
-        };
-
-        let changeset_new = ChangeSet {
-            descriptor: Some(descriptor),
-            change_descriptor: Some(change_descriptor),
-            network: Some(Network::Bitcoin),
-            local_chain: local_chain_changeset,
-            tx_graph: tx_graph_changeset,
-            indexer: keychain_txout_changeset,
-        };
-
-        store.persist_wallet(&changeset_new).unwrap();
-        let mut changeset_read_new = ChangeSet::default();
-        store.read_wallet(&mut changeset_read_new).unwrap();
-
-        changeset.merge(changeset_new);
-
-        assert_eq!(changeset, changeset_read_new);
-    }
 
     #[cfg(feature = "wallet")]
     #[test]
@@ -2282,4 +2024,15 @@ mod test {
             },
         );
     }
+
+    #[cfg(feature = "wallet")]
+    #[test]
+    fn network_is_persisted() {
+        use bdk_wallet::persist_test_utils::persist_network;
+
+        persist_network("wallet.redb", |path| {
+            let db = redb::Database::create(path)?;
+            Ok(Store::new(Arc::new(db), "wallet".to_string())?)
+        });
+    }
 }