cleanup protobuf mess

build_pb.sh

@@ -1,3 +1,8 @@
 #!/bin/bash
-cd ./trezor-common/protob
-protoc --python_out=../../trezorlib/ -I/usr/include -I. -I. trezor.proto
+CURDIR=$(pwd)
+
+cd $CURDIR/../trezor-common/protob
+
+for i in messages types ; do
+    protoc --python_out=$CURDIR/trezorlib/ -I/usr/include -I. $i.proto
+done

protob/build.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cd `dirname $0`/../../trezor-common/protob
-
-protoc --python_out=../../trezor-emu/trezor/ -I/usr/include -I. types.proto
-protoc --python_out=../../trezor-emu/trezor/ -I/usr/include -I. messages.proto

tests/test_signtx.py

@@ -2,7 +2,7 @@ import unittest
 import common
 import binascii
 
-import trezorlib.trezor_pb2 as proto
+import trezorlib.messages_pb2 as proto
 
 '''
 ./electrum -w ~/.electrum-bitkey mktx 1FQVPnjrbkPWeA8poUoEnX9U3n9DyhAVtv 0.001

trezorlib/__init__.py

@@ -1,6 +1,6 @@
 try:
-    import trezor_pb2 as proto
+    import messages_pb2 as proto
 except ImportError:
-    print "Source trezor_pb2.py not found. Make sure python-protobuf is installed and run build_pb.sh to generate it."
+    print "Source messages_pb2.py or types_pb2.py not found. Make sure python-protobuf is installed and run build_pb.sh to generate it."
     import sys
     sys.exit()

trezorlib/ckd_public.py

@@ -4,7 +4,7 @@ import hashlib
 from ecdsa.util import string_to_number
 from ecdsa.curves import SECP256k1
 
-import trezor_pb2 as proto
+import messages_pb2 as proto
 
 PRIME_DERIVATION_FLAG = 0x80000000
 

trezorlib/client.py

@@ -2,7 +2,7 @@ import os
 import time
 
 import ckd_public
-import trezor_pb2 as proto
+import messages_pb2 as proto
 
 def show_message(message):
     print "MESSAGE FROM DEVICE:", message

trezorlib/debuglink.py

@@ -1,4 +1,4 @@
-import trezor_pb2 as proto
+import messages_pb2 as proto
 from transport import NotImplementedException
 
 def pin_info(pin):

trezorlib/mapping.py

@@ -1,4 +1,4 @@
-import trezor_pb2 as proto
+import messages_pb2 as proto
 
 map_type_to_class = {}
 map_class_to_type = {}