From a4f103755bcc495780fd20637938975b0083d3af Mon Sep 17 00:00:00 2001
From: Jan Pochyla <jpochyla@gmail.com>
Date: Thu, 8 Dec 2016 16:18:58 +0100
Subject: [PATCH] minor api changes

---
 src/lib/protobuf.py    |  4 ++--
 src/main.py            |  7 +++----
 src/trezor/loop.py     | 10 +++++-----
 src/trezor/workflow.py |  6 +++---
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/lib/protobuf.py b/src/lib/protobuf.py
index c6d95cbe64..03556d265b 100644
--- a/src/lib/protobuf.py
+++ b/src/lib/protobuf.py
@@ -20,14 +20,14 @@ from micropython import const
 from streams import StreamReader, BufferWriter
 
 
-def build_protobuf_message(msg_type, callback=None, *args):
+def build_message(msg_type, callback=None, *args):
     msg = msg_type()
     try:
         while True:
             field, fvalue = yield
             fname, ftype, fflags = field
             if issubclass(ftype, MessageType):
-                fvalue = yield from build_protobuf_message(ftype)
+                fvalue = yield from build_message(ftype)
             if fflags & FLAG_REPEATED:
                 prev_value = getattr(msg, fname, [])
                 prev_value.append(fvalue)
diff --git a/src/main.py b/src/main.py
index aa50c6c503..bf794793ef 100644
--- a/src/main.py
+++ b/src/main.py
@@ -26,12 +26,11 @@ msg.set_interfaces([0xFF00, 0xFF01, 0xF1D0])
 for i, up in enumerate(msg.get_interfaces()):
     print("iface %d: usage_page 0x%04x" % (i + 1, up))
 
-
 # Initialize the wire codec pipeline
-wire.setup()
+wire.setup(0xFF00)
 
 # Load default homescreen
-from apps.homescreen.layout_homescreen import layout_homescreen
+from apps.homescreen.homescreen import layout_homescreen
 
-# Run main even loop and specify, which screen is default
+# Run main even loop and specify which screen is default
 trezor.main.run(default_workflow=layout_homescreen)
diff --git a/src/trezor/loop.py b/src/trezor/loop.py
index 02ffb0494b..5158c7abc3 100644
--- a/src/trezor/loop.py
+++ b/src/trezor/loop.py
@@ -72,10 +72,10 @@ def run_task(task, value):
         ui.display.refresh()
 
 
-def handle_message(message):
+def handle_message(m):
     if not paused_tasks:
         return
-    iface, *value = message
+    iface, *value = m
     tasks = paused_tasks.pop(iface, ())
     for task in tasks:
         run_task(task, value)
@@ -101,9 +101,9 @@ def run_forever():
             # add current delay to ring buffer for performance stats
             log_delay_rb[log_delay_pos] = delay
             log_delay_pos = (log_delay_pos + 1) % log_delay_rb_len
-        message = msg.select(delay)
-        if message:
-            handle_message(message)
+        m = msg.select(delay)
+        if m:
+            handle_message(m)
         else:
             handle_timeout()
 
diff --git a/src/trezor/workflow.py b/src/trezor/workflow.py
index 3dbb0702a2..cd8ee43e9b 100644
--- a/src/trezor/workflow.py
+++ b/src/trezor/workflow.py
@@ -21,15 +21,15 @@ def close_default():
     _default = None
 
 
-def start_workflow(workflow):
+def start(workflow):
     if _default is not None:
         close_default()
     _started.append(workflow)
     log.info(__name__, 'start %s', workflow)
-    loop.schedule_task(_watch_workflow(workflow))
+    loop.schedule_task(_watch(workflow))
 
 
-async def _watch_workflow(workflow):
+async def _watch(workflow):
     try:
         return await workflow
     finally: