Fix failing test: test_del_tx

Before this PR, the `test_del_tx` test was failing for sqlite. This was
because `del_tx` pulls the TransactionDetails object using
`select_transaction_details_by_txid` method which gets the transaction
details' data with a non-None transaction field even if the
`include_raw` argument is `false`. So the test was expecting a
TransactionDetails object with a None transaction field but will
get one with a non-None transaction field. Furthermore, it is not
always necessary to get a transaction after getting the transaction
details, but `select_transaction_details_by_txid` does it all the time,
whether `include_raw` is false or true.

Author: vladimirfomene

src/database/sqlite.rs

@@ -467,7 +467,7 @@ impl SqliteDatabase {
         &self,
         txid: &[u8],
     ) -> Result<Option<TransactionDetails>, Error> {
-        let mut statement = self.connection.prepare_cached("SELECT transaction_details.timestamp, transaction_details.received, transaction_details.sent, transaction_details.fee, transaction_details.height, transactions.raw_tx FROM transaction_details, transactions WHERE transaction_details.txid=transactions.txid AND transaction_details.txid=:txid")?;
+        let mut statement = self.connection.prepare_cached("SELECT timestamp, received, sent, fee, height FROM transaction_details WHERE txid=:txid")?;
         let mut rows = statement.query(named_params! { ":txid": txid })?;
 
         match rows.next()? {
@@ -478,22 +478,13 @@ impl SqliteDatabase {
                 let fee: Option<u64> = row.get(3)?;
                 let height: Option<u32> = row.get(4)?;
 
-                let raw_tx: Option<Vec<u8>> = row.get(5)?;
-                let tx: Option<Transaction> = match raw_tx {
-                    Some(raw_tx) => {
-                        let tx: Transaction = deserialize(&raw_tx)?;
-                        Some(tx)
-                    }
-                    None => None,
-                };
-
                 let confirmation_time = match (height, timestamp) {
                     (Some(height), Some(timestamp)) => Some(BlockTime { height, timestamp }),
                     _ => None,
                 };
 
                 Ok(Some(TransactionDetails {
-                    transaction: tx,
+                    transaction: None,
                     txid: deserialize(txid)?,
                     received,
                     sent,
@@ -663,19 +654,24 @@ impl BatchOperations for SqliteDatabase {
     }
 
     fn set_tx(&mut self, transaction: &TransactionDetails) -> Result<(), Error> {
+        // insert the raw_tx if present
+        if let Some(ref tx) = transaction.transaction {
+            self.set_raw_tx(tx)?;
+        }
+
+        // remove the raw tx from the serialized version
+        let mut transaction = transaction.clone();
+        transaction.transaction = None;
+
         match self.select_transaction_details_by_txid(&transaction.txid)? {
             Some(_) => {
-                self.update_transaction_details(transaction)?;
+                self.update_transaction_details(&transaction)?;
             }
             None => {
-                self.insert_transaction_details(transaction)?;
+                self.insert_transaction_details(&transaction)?;
             }
         }
 
-        if let Some(tx) = &transaction.transaction {
-            self.set_raw_tx(tx)?;
-        }
-
         Ok(())
     }
 
@@ -744,12 +740,15 @@ impl BatchOperations for SqliteDatabase {
         include_raw: bool,
     ) -> Result<Option<TransactionDetails>, Error> {
         match self.select_transaction_details_by_txid(txid)? {
-            Some(transaction_details) => {
+            Some(mut transaction_details) => {
                 self.delete_transaction_details_by_txid(txid)?;
 
-                if include_raw {
-                    self.delete_transaction_by_txid(txid)?;
-                }
+                let raw_tx = if include_raw {
+                    self.del_raw_tx(txid)?
+                } else {
+                    None
+                };
+                transaction_details.transaction = raw_tx;
                 Ok(Some(transaction_details))
             }
             None => Ok(None),
@@ -864,8 +863,8 @@ impl Database for SqliteDatabase {
     fn get_tx(&self, txid: &Txid, include_raw: bool) -> Result<Option<TransactionDetails>, Error> {
         match self.select_transaction_details_by_txid(txid)? {
             Some(mut transaction_details) => {
-                if !include_raw {
-                    transaction_details.transaction = None;
+                if include_raw {
+                    transaction_details.transaction = self.get_raw_tx(txid)?;
                 }
                 Ok(Some(transaction_details))
             }