refactor(tx_graph): make tx_graph::ChangeSet nested again

The serialization format of the nested structure is exactly the same as
the as the old `indexed_tx_graph::ChangeSet`. The old
`tx_graph::ChangeSet` is replaced with `tx_graph::TxChangeSet`.

Author: ValuedMammal

crates/bitcoind_rpc/tests/test_emitter.rs

@@ -189,7 +189,7 @@ fn test_into_tx_graph() -> anyhow::Result<()> {
         assert!(emitter.next_block()?.is_none());
 
         let mempool_txs = emitter.mempool()?;
-        let tx_graph_changeset = tx_graph.batch_insert_unconfirmed(mempool_txs);
+        let tx_graph_changeset = tx_graph.batch_insert_unconfirmed(mempool_txs).tx_data;
         assert_eq!(
             tx_graph_changeset
                 .txs
@@ -221,7 +221,9 @@ fn test_into_tx_graph() -> anyhow::Result<()> {
         let emission = emitter.next_block()?.expect("must get mined block");
         let height = emission.block_height();
         let _ = chain.apply_update(emission.checkpoint)?;
-        let tx_graph_changeset = tx_graph.apply_block_relevant(&emission.block, height);
+        let tx_graph_changeset = tx_graph
+            .apply_block_relevant(&emission.block, height)
+            .tx_data;
         assert!(tx_graph_changeset.txs.is_empty());
         assert!(tx_graph_changeset.txouts.is_empty());
         assert_eq!(tx_graph_changeset.anchors, exp_anchors);

crates/chain/src/rusqlite_impl.rs

@@ -199,8 +199,8 @@ fn to_sql_error<E: std::error::Error + Send + Sync + 'static>(err: E) -> rusqlit
     rusqlite::Error::ToSqlConversionFailure(Box::new(err))
 }
 
-impl tx_graph::ChangeSet<ConfirmationBlockTime> {
-    /// Schema name for [`tx_graph::ChangeSet`].
+impl tx_graph::TxChangeSet<ConfirmationBlockTime> {
+    /// Schema name for [`tx_graph::TxChangeSet`].
     pub const SCHEMA_NAME: &'static str = "bdk_txgraph";
     /// Name of table that stores full transactions and `last_seen` timestamps.
     pub const TXS_TABLE_NAME: &'static str = "bdk_txs";
@@ -209,7 +209,7 @@ impl tx_graph::ChangeSet<ConfirmationBlockTime> {
     /// Name of table that stores [`Anchor`]s.
     pub const ANCHORS_TABLE_NAME: &'static str = "bdk_anchors";
 
-    /// Get v0 of sqlite [tx_graph::ChangeSet] schema
+    /// Get v0 of sqlite [`tx_graph::TxChangeSet`] schema
     pub fn schema_v0() -> String {
         // full transactions
         let create_txs_table = format!(
@@ -247,7 +247,7 @@ impl tx_graph::ChangeSet<ConfirmationBlockTime> {
         format!("{create_txs_table}; {create_txouts_table}; {create_anchors_table}")
     }
 
-    /// Get v1 of sqlite [tx_graph::ChangeSet] schema
+    /// Get v1 of sqlite [`tx_graph::TxChangeSet`] schema
     pub fn schema_v1() -> String {
         let add_confirmation_time_column = format!(
             "ALTER TABLE {} ADD COLUMN confirmation_time INTEGER DEFAULT -1 NOT NULL",
@@ -567,7 +567,7 @@ mod test {
 
     #[test]
     fn can_persist_anchors_and_txs_independently() -> anyhow::Result<()> {
-        type ChangeSet = tx_graph::ChangeSet<ConfirmationBlockTime>;
+        type ChangeSet = tx_graph::TxChangeSet<ConfirmationBlockTime>;
         let mut conn = rusqlite::Connection::open_in_memory()?;
 
         // init tables
@@ -629,7 +629,7 @@ mod test {
 
     #[test]
     fn v0_to_v1_schema_migration_is_backward_compatible() -> anyhow::Result<()> {
-        type ChangeSet = tx_graph::ChangeSet<ConfirmationBlockTime>;
+        type ChangeSet = tx_graph::TxChangeSet<ConfirmationBlockTime>;
         let mut conn = rusqlite::Connection::open_in_memory()?;
 
         // Create initial database with v0 sqlite schema