fixup: transaction lists with tests

Author: matthiasdebernardini

src/lib.rs

@@ -159,7 +159,7 @@ impl Store {
         dbg!(&row);
 
         if let Some(row) = row {
-            Self::changeset_from_row(&mut tx, &mut changeset, row).await?;
+            Self::changeset_from_row(&mut tx, &mut changeset, row, &self.wallet_name).await?;
         }
 
         Ok(changeset)
@@ -170,6 +170,7 @@ impl Store {
         tx: &mut Transaction<'_, Postgres>,
         changeset: &mut ChangeSet,
         row: PgRow,
+        wallet_name: &str,
     ) -> Result<(), BdkSqlxError> {
         info!("changeset from row");
 
@@ -199,8 +200,8 @@ impl Store {
             }
         }
 
-        changeset.tx_graph = tx_graph_changeset_from_postgres(tx).await?;
-        changeset.local_chain = local_chain_changeset_from_postgres(tx).await?;
+        changeset.tx_graph = tx_graph_changeset_from_postgres(tx, wallet_name).await?;
+        changeset.local_chain = local_chain_changeset_from_postgres(tx, wallet_name).await?;
         Ok(())
     }
 
@@ -317,12 +318,14 @@ async fn update_last_revealed(
 #[tracing::instrument]
 pub async fn tx_graph_changeset_from_postgres(
     db_tx: &mut Transaction<'_, Postgres>,
+    wallet_name: &str,
 ) -> Result<tx_graph::ChangeSet<ConfirmationBlockTime>, BdkSqlxError> {
     info!("tx graph changeset from postgres");
     let mut changeset = tx_graph::ChangeSet::default();
 
     // Fetch transactions
-    let rows = sqlx::query("SELECT txid, whole_tx, last_seen FROM tx")
+    let rows = sqlx::query("SELECT txid, whole_tx, last_seen FROM tx WHERE wallet_name = $1")
+        .bind(wallet_name)
         .fetch_all(&mut **db_tx)
         .await?;
 
@@ -343,7 +346,8 @@ pub async fn tx_graph_changeset_from_postgres(
     }
 
     // Fetch txouts
-    let rows = sqlx::query("SELECT txid, vout, value, script FROM txout")
+    let rows = sqlx::query("SELECT txid, vout, value, script FROM txout  WHERE wallet_name = $1")
+        .bind(wallet_name)
         .fetch_all(&mut **db_tx)
         .await?;
 
@@ -367,7 +371,8 @@ pub async fn tx_graph_changeset_from_postgres(
     }
 
     // Fetch anchors
-    let rows = sqlx::query("SELECT anchor, txid FROM anchor_tx")
+    let rows = sqlx::query("SELECT anchor, txid FROM anchor_tx WHERE wallet_name = $1")
+        .bind(wallet_name)
         .fetch_all(&mut **db_tx)
         .await?;
 
@@ -449,11 +454,13 @@ pub async fn tx_graph_changeset_persist_to_postgres(
 #[tracing::instrument]
 pub async fn local_chain_changeset_from_postgres(
     db_tx: &mut Transaction<'_, Postgres>,
+    wallet_name: &str,
 ) -> Result<local_chain::ChangeSet, BdkSqlxError> {
     info!("local chain changeset from postgres");
     let mut changeset = local_chain::ChangeSet::default();
 
-    let rows = sqlx::query("SELECT hash, height FROM block")
+    let rows = sqlx::query("SELECT hash, height FROM block WHERE wallet_name = $1")
+        .bind(wallet_name)
         .fetch_all(&mut **db_tx)
         .await?;