refactor: Make db mutex non-recursive.

basicswap/protocols/atomic_swap_1.py

@@ -105,7 +105,7 @@ def redeemITx(self, bid_id: bytes, session):
     bid, offer = self.getBidAndOffer(bid_id, session)
     ci_from = self.ci(offer.coin_from)
 
-    txn = self.createRedeemTxn(ci_from.coin_type(), bid, for_txn_type='initiate')
+    txn = self.createRedeemTxn(ci_from.coin_type(), bid, for_txn_type='initiate', session=session)
     txid = ci_from.publishTx(bytes.fromhex(txn))
 
     bid.initiate_tx.spend_txid = bytes.fromhex(txid)

basicswap/protocols/xmr_swap_1.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020-2023 tecnovert
+# Copyright (c) 2020-2024 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
-from sqlalchemy.orm import scoped_session
-
 from basicswap.util import (
     ensure,
 )
@@ -45,7 +43,7 @@ def addLockRefundSigs(self, xmr_swap, ci):
 def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key):
     self.log.info('Manually recovering %s', bid_id.hex())
     # Manually recover txn if other key is known
-    session = scoped_session(self.session_factory)
+    session = self.openSession()
     try:
         bid, xmr_swap = self.getXmrBidFromSession(session, bid_id)
         ensure(bid, 'Bid not found: {}.'.format(bid_id.hex()))
@@ -86,8 +84,7 @@ def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key):
 
         return txid
     finally:
-        session.close()
-        session.remove()
+        self.closeSession(session, commit=False)
 
 
 def getChainBSplitKey(swap_client, bid, xmr_swap, offer):