xmr: tsx confirmation raises exception on cancellation

ph4r05 · Sep 17, 2018 · 447a862 · 447a862
1 parent 00dd8f6
commit 447a862
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/apps/monero/controller/iface.py b/src/apps/monero/controller/iface.py
@@ -96,7 +96,6 @@ async def confirm_transaction(self, tsx_data, creds=None, ctx=None):
         loop.schedule(slide)
 
         await loop.sleep(200 * 1000)
-        return True
 
     async def transaction_error(self, *args, **kwargs):
         from trezor import ui

diff --git a/src/apps/monero/protocol/tsx_sign_builder.py b/src/apps/monero/protocol/tsx_sign_builder.py
@@ -331,13 +331,7 @@ async def init_transaction(self, tsx_data):
         self._mem_trace(1)
 
         # Ask for confirmation
-        confirmation = await self.iface.confirm_transaction(tsx_data, self.creds)
-        if not confirmation:
-            from trezor.messages import FailureType
-            from trezor.messages.Failure import Failure
-
-            return Failure(code=FailureType.ActionCancelled, message="rejected")
-
+        await self.iface.confirm_transaction(tsx_data, self.creds)
         gc.collect()
         self._mem_trace(3)