ledger-rpc_api: Add wrapper in Ledger for add/get transaction.

chainwayxyz · Jun 10, 2024 · 2e79b97 · 2e79b97
1 parent 38433e9
commit 2e79b97
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/src/client/rpc_api.rs b/src/client/rpc_api.rs
@@ -43,12 +43,7 @@ impl RpcApi for Client {
         txid: &bitcoin::Txid,
         _block_hash: Option<&bitcoin::BlockHash>,
     ) -> bitcoincore_rpc::Result<bitcoin::Transaction> {
-        Ok(self
-            .database
-            .lock()
-            .unwrap()
-            .get_transaction(&txid.to_string())
-            .unwrap())
+        Ok(self.ledger.get_transaction(*txid))
     }
 
     fn send_raw_transaction<R: bitcoincore_rpc::RawTx>(
@@ -57,11 +52,7 @@ impl RpcApi for Client {
     ) -> bitcoincore_rpc::Result<bitcoin::Txid> {
         let tx: Transaction = encode::deserialize_hex(&tx.raw_hex()).unwrap();
 
-        self.database
-            .lock()
-            .unwrap()
-            .insert_transaction_unconditionally(&tx)
-            .unwrap();
+        self.ledger.add_transaction_unconditionally(tx.clone());
 
         Ok(tx.compute_txid())
     }
@@ -191,11 +182,7 @@ impl RpcApi for Client {
             output: vec![txout],
         };
 
-        self.database
-            .lock()
-            .unwrap()
-            .insert_transaction_unconditionally(&tx)
-            .unwrap();
+        self.ledger.add_transaction_unconditionally(tx.clone());
 
         for output in tx.output {
             self.ledger.add_utxo(output);

diff --git a/src/ledger/transactions.rs b/src/ledger/transactions.rs
@@ -2,7 +2,7 @@
 
 use super::Ledger;
 use crate::{add_item, get_item};
-use bitcoin::{Transaction, TxOut};
+use bitcoin::{Transaction, TxOut, Txid};
 
 impl Ledger {
     /// Adds a new UTXO to user's UTXO's.
@@ -25,6 +25,14 @@ impl Ledger {
         add_item!(self.transactions, transaction);
     }
     /// Returns user's list of transactions.
+    pub fn get_transaction(&self, txid: Txid) -> Transaction {
+        self.database
+            .lock()
+            .unwrap()
+            .get_transaction(&txid.to_string())
+            .unwrap()
+    }
+    /// Returns user's list of transactions.
     pub fn get_transactions(&self) -> Vec<Transaction> {
         get_item!(self.transactions);
     }