[blockchain] Fetch data request collateral and fee from the database without building a DataRequest object

Author: drcpu-github

blockchain/transactions/commit.py

@@ -1,4 +1,7 @@
-from blockchain.transactions.data_request import DataRequest
+from blockchain.transactions.data_request import (
+    get_collateral_for_data_request,
+    get_commit_and_reveal_fee_for_data_request,
+)
 from blockchain.transactions.transaction import Transaction
 from schemas.component.commit_schema import (
     CommitTransactionForApi,
@@ -23,8 +26,9 @@ def process_transaction(self, call_from):
         self.txn_details["data_request"] = self.json_txn["body"]["dr_pointer"]
 
         # Get the reward for the miner of this transaction
-        fee = DataRequest().get_commit_and_reveal_fee_for_data_request(
-            self.txn_details["data_request"]
+        fee = get_commit_and_reveal_fee_for_data_request(
+            self.database,
+            self.txn_details["data_request"],
         )
         if "fee" in fee:
             self.txn_details["fee"] = fee["fee"]
@@ -36,8 +40,9 @@ def process_transaction(self, call_from):
             )
 
         # Fetch collateral from database since we cannot use output / input difference anymore to calculate it
-        collateral = DataRequest().get_collateral_for_data_request(
-            self.txn_details["data_request"]
+        collateral = get_collateral_for_data_request(
+            self.database,
+            self.txn_details["data_request"],
         )
         if "collateral" in collateral:
             self.txn_details["collateral"] = collateral["collateral"]

blockchain/transactions/data_request.py

@@ -301,46 +301,6 @@ def get_transaction_from_database(self, data_request_hash):
         else:
             return {"error": "transaction not found"}
 
-    def get_commit_and_reveal_fee_for_data_request(self, data_request_hash):
-        sql = """
-            SELECT
-                data_request_txns.commit_and_reveal_fee
-            FROM
-                data_request_txns
-            WHERE
-                data_request_txns.txn_hash=%s
-            LIMIT 1
-        """
-        result = self.database.sql_return_one(
-            sql,
-            parameters=[bytearray.fromhex(data_request_hash)],
-        )
-
-        if result:
-            return {"fee": result[0]}
-        else:
-            return {"error": "transaction not found"}
-
-    def get_collateral_for_data_request(self, data_request_hash):
-        sql = """
-            SELECT
-                data_request_txns.collateral
-            FROM
-                data_request_txns
-            WHERE
-                data_request_txns.txn_hash=%s
-            LIMIT 1
-        """
-        result = self.database.sql_return_one(
-            sql,
-            parameters=[bytearray.fromhex(data_request_hash)],
-        )
-
-        if result:
-            return {"collateral": result[0]}
-        else:
-            return {"error": "transaction not found"}
-
     def calculate_fees(
         self,
         witnesses,
@@ -360,6 +320,48 @@ def calculate_fees(
         return dro_fee, miner_fee
 
 
+def get_commit_and_reveal_fee_for_data_request(database, data_request_hash):
+    sql = """
+        SELECT
+            data_request_txns.commit_and_reveal_fee
+        FROM
+            data_request_txns
+        WHERE
+            data_request_txns.txn_hash=%s
+        LIMIT 1
+    """
+    result = database.sql_return_one(
+        sql,
+        parameters=[bytearray.fromhex(data_request_hash)],
+    )
+
+    if result:
+        return {"fee": result[0]}
+    else:
+        return {"error": "transaction not found"}
+
+
+def get_collateral_for_data_request(database, data_request_hash):
+    sql = """
+        SELECT
+            data_request_txns.collateral
+        FROM
+            data_request_txns
+        WHERE
+            data_request_txns.txn_hash=%s
+        LIMIT 1
+    """
+    result = database.sql_return_one(
+        sql,
+        parameters=[bytearray.fromhex(data_request_hash)],
+    )
+
+    if result:
+        return {"collateral": result[0]}
+    else:
+        return {"error": "transaction not found"}
+
+
 def build_retrieval(kinds, urls, all_headers, bodies, scripts):
     # Add kinds, urls, bodies and translate scripts
     # psycopg does not handle arrays of enums very well

blockchain/transactions/reveal.py

@@ -2,7 +2,7 @@
 
 import cbor2
 
-from blockchain.transactions.data_request import DataRequest
+from blockchain.transactions.data_request import get_commit_and_reveal_fee_for_data_request
 from blockchain.transactions.transaction import Transaction
 from schemas.component.reveal_schema import (
     RevealTransactionForApi,
@@ -28,8 +28,9 @@ def process_transaction(self, call_from):
         self.txn_details["data_request"] = self.json_txn["body"]["dr_pointer"]
 
         # Get the reward for the miner of this transaction
-        fee = DataRequest().get_commit_and_reveal_fee_for_data_request(
-            self.txn_details["data_request"]
+        fee = get_commit_and_reveal_fee_for_data_request(
+            self.database,
+            self.txn_details["data_request"],
         )
         if "fee" in fee:
             self.txn_details["fee"] = fee["fee"]