From 07dd27c5676d26d7bf2389b83e7bf9b2efad5247 Mon Sep 17 00:00:00 2001
From: Jan Pochyla <jpochyla@gmail.com>
Date: Mon, 26 Sep 2016 13:07:53 +0200
Subject: [PATCH] get rid of layout stubs

---
 src/apps/wallet/__init__.py            |  9 +--------
 src/apps/wallet/layout_sign_message.py | 19 +++++++++----------
 src/apps/wallet/layout_sign_tx.py      |  8 --------
 3 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 src/apps/wallet/layout_sign_tx.py

diff --git a/src/apps/wallet/__init__.py b/src/apps/wallet/__init__.py
index 1e9c18003..dc74b341a 100644
--- a/src/apps/wallet/__init__.py
+++ b/src/apps/wallet/__init__.py
@@ -1,7 +1,7 @@
 from trezor.wire import register_type, protobuf_handler
 from trezor.utils import unimport
 from trezor.messages.wire_types import \
-    GetPublicKey, SignTx, SignMessage
+    GetPublicKey, SignMessage
 
 
 @unimport
@@ -10,12 +10,6 @@ def dispatch_GetPublicKey(*args, **kwargs):
     return layout_get_public_key(*args, **kwargs)
 
 
-@unimport
-def dispatch_SignTx(*args, **kwargs):
-    from .layout_sign_tx import layout_sign_tx
-    return layout_sign_tx(*args, **kwargs)
-
-
 @unimport
 def dispatch_SignMessage(*args, **kwargs):
     from .layout_sign_message import layout_sign_message
@@ -24,5 +18,4 @@ def dispatch_SignMessage(*args, **kwargs):
 
 def boot():
     register_type(GetPublicKey, protobuf_handler, dispatch_GetPublicKey)
-    register_type(SignTx, protobuf_handler, dispatch_SignTx)
     register_type(SignMessage, protobuf_handler, dispatch_SignMessage)
diff --git a/src/apps/wallet/layout_sign_message.py b/src/apps/wallet/layout_sign_message.py
index db6dea55d..748398dc5 100644
--- a/src/apps/wallet/layout_sign_message.py
+++ b/src/apps/wallet/layout_sign_message.py
@@ -1,20 +1,19 @@
 from trezor import wire, ui
 from trezor.utils import unimport
-from trezor.workflows.confirm import confirm
 
 
 @unimport
-def layout_sign_message(message):
+async def layout_sign_message(message):
+    from trezor.workflows.confirm import protect_with_confirm
+    from trezor.messages.Success import Success
+
     ui.clear()
     ui.display.text(10, 30, 'Signing message',
                     ui.BOLD, ui.LIGHT_GREEN, ui.BLACK)
     ui.display.text(10, 60, message.message, ui.MONO, ui.WHITE, ui.BLACK)
-    confirmed = yield from confirm(confirm='Sign')
 
-    if confirmed:
-        from trezor.messages.Success import Success
-        yield from wire.write(Success(message='Signed'))
-    else:
-        from trezor.messages.Failure import Failure
-        from trezor.messages.FailureType import ActionCancelled
-        yield from wire.write(Failure(message='Cancelled', code=ActionCancelled))
+    await protect_with_confirm(confirm='Sign')
+
+    # TODO
+
+    return Success(message='Signed')
diff --git a/src/apps/wallet/layout_sign_tx.py b/src/apps/wallet/layout_sign_tx.py
deleted file mode 100644
index 9ded35d9b..000000000
--- a/src/apps/wallet/layout_sign_tx.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from trezor import wire, ui
-from trezor.utils import unimport
-
-
-@unimport
-def layout_sign_tx(message):
-    ui.clear()
-    print('sending')