follow-up prev

electrum/daemon.py

@@ -191,7 +191,7 @@ class PayServer(Logger):
         # FIXME specify wallet somehow?
         return list(self.daemon.get_wallets().values())[0]
 
-    async def on_payment(self, evt, wallet, key, status):
+    async def on_payment(self, evt, key, status):
         if status == PR_PAID:
             self.pending[key].set()
 

electrum/lnworker.py

@@ -1207,7 +1207,7 @@ class LNWallet(LNWorker):
 
     def payment_received(self, chan, payment_hash: bytes):
         self.set_payment_status(payment_hash, PR_PAID)
-        util.trigger_callback('request_status', self.wallet, payment_hash.hex(), PR_PAID)
+        util.trigger_callback('request_status', payment_hash.hex(), PR_PAID)
         util.trigger_callback('ln_payment_completed', payment_hash, chan.channel_id)
 
     async def _calc_routing_hints_for_invoice(self, amount_sat: Optional[int]):

electrum/wallet.py

@@ -1623,7 +1623,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
             addr = self.get_txout_address(txo)
             if addr in self.receive_requests:
                 status, conf = self.get_request_status(addr)
-                util.trigger_callback('request_status', self, addr, status)
+                util.trigger_callback('request_status', addr, status)
 
     def make_payment_request(self, addr, amount, message, expiration):
         timestamp = int(time.time())