Fixed requested things in PR

swapper-org · Mar 2, 2022 · 78b679d · 78b679d
1 parent 0045052
commit 78b679d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Connector/btc/apirpc.py b/Connector/btc/apirpc.py
@@ -396,20 +396,19 @@ def getTransaction(id, params, config):
         transaction = RPCConnector.request(
             endpoint=config.bitcoincoreRpcEndpoint,
             id=id,
-            method="getrawtransaction",
+            method=GET_TRANSACTION_METHOD,
             params=[
                 params["txHash"],
                 True
             ]
         )
 
-        isConfirmed = "blockhash" in transaction
-
-        if isConfirmed:
+        # Check if transaction is confirmed, and obtain block number
+        if "blockhash" in transaction:
             transactionBlock = RPCConnector.request(
                 endpoint=config.bitcoincoreRpcEndpoint,
                 id=id,
-                method="getblock",
+                method=GET_BLOCK,
                 params=[transaction["blockhash"], 1]
             )
             blockNumber = transactionBlock["height"]

diff --git a/Connector/btc/constants.py b/Connector/btc/constants.py
@@ -100,6 +100,7 @@
 NOTIFY = "notify"
 NEW_HASH_BLOCK_ZMQ_TOPIC = "hashblock"
 NEW_RAW_BLOCK_ZMQ_TOPIC = "rawblock"
+GET_BLOCK = "getblock"
 
 SUBSCRIBE_ADDRESS_BALANCE = "subscribetoaddressbalance"
 UNSUBSCRIBE_ADDRESS_BALANCE = "unsubscribefromaddressbalance"