protob: rename common.proto to messages-common.proto, move Success/Failure and friends there

protob/common.proto

@@ -1,14 +0,0 @@
-syntax = "proto2";
-
-/**
- * Structure representing BIP32 (hierarchical deterministic) node
- * Used for imports of private key into the device and exporting public key out of device
- */
-message HDNodeType {
-    required uint32 depth = 1;
-    required uint32 fingerprint = 2;
-    required uint32 child_num = 3;
-    required bytes chain_code = 4;
-    optional bytes private_key = 5;
-    optional bytes public_key = 6;
-}

protob/messages-bitcoin.proto

@@ -4,7 +4,7 @@ syntax = "proto2";
 option java_package = "com.satoshilabs.trezor.lib.protobuf";
 option java_outer_classname = "TrezorMessageBitcoin";
 
-import "common.proto";
+import "messages-common.proto";
 
 /**
  * Type of script which will be used for transaction output

protob/messages-cardano.proto

@@ -4,7 +4,7 @@ syntax = "proto2";
 option java_package = "com.satoshilabs.trezor.lib.protobuf";
 option java_outer_classname = "TrezorMessageCardano";
 
-import "common.proto";
+import "messages-common.proto";
 
 /**
  * Request: Ask device for Cardano address

protob/messages-common.proto

@@ -0,0 +1,138 @@
+syntax = "proto2";
+
+/**
+ * Response: Success of the previous request
+ */
+ message Success {
+    optional string message = 1;    // human readable description of action or request-specific payload
+}
+
+/**
+* Response: Failure of the previous request
+*/
+message Failure {
+    optional FailureType code = 1;  // computer-readable definition of the error state
+    optional string message = 2;    // human-readable message of the error state
+    enum FailureType {
+        Failure_UnexpectedMessage = 1;
+        Failure_ButtonExpected = 2;
+        Failure_DataError = 3;
+        Failure_ActionCancelled = 4;
+        Failure_PinExpected = 5;
+        Failure_PinCancelled = 6;
+        Failure_PinInvalid = 7;
+        Failure_InvalidSignature = 8;
+        Failure_ProcessError = 9;
+        Failure_NotEnoughFunds = 10;
+        Failure_NotInitialized = 11;
+        Failure_PinMismatch = 12;
+        Failure_FirmwareError = 99;
+    }
+}
+
+/**
+ * Response: Device is waiting for HW button press.
+ * @next ButtonAck
+ * @next Cancel
+ */
+message ButtonRequest {
+    optional ButtonRequestType code = 1;
+    optional string data = 2;
+    /**
+    * Type of button request
+    */
+    enum ButtonRequestType {
+        ButtonRequest_Other = 1;
+        ButtonRequest_FeeOverThreshold = 2;
+        ButtonRequest_ConfirmOutput = 3;
+        ButtonRequest_ResetDevice = 4;
+        ButtonRequest_ConfirmWord = 5;
+        ButtonRequest_WipeDevice = 6;
+        ButtonRequest_ProtectCall = 7;
+        ButtonRequest_SignTx = 8;
+        ButtonRequest_FirmwareCheck = 9;
+        ButtonRequest_Address = 10;
+        ButtonRequest_PublicKey = 11;
+        ButtonRequest_MnemonicWordCount = 12;
+        ButtonRequest_MnemonicInput = 13;
+        ButtonRequest_PassphraseType = 14;
+    }
+}
+
+/**
+ * Request: Computer agrees to wait for HW button press
+ * @prev ButtonRequest
+ */
+message ButtonAck {
+}
+
+/**
+ * Response: Device is asking computer to show PIN matrix and awaits PIN encoded using this matrix scheme
+ * @next PinMatrixAck
+ * @next Cancel
+ */
+message PinMatrixRequest {
+    optional PinMatrixRequestType type = 1;
+    /**
+    * Type of PIN request
+    */
+    enum PinMatrixRequestType {
+        PinMatrixRequestType_Current = 1;
+        PinMatrixRequestType_NewFirst = 2;
+        PinMatrixRequestType_NewSecond = 3;
+    }
+}
+
+/**
+ * Request: Computer responds with encoded PIN
+ * @prev PinMatrixRequest
+ */
+message PinMatrixAck {
+    required string pin = 1;    // matrix encoded PIN entered by user
+}
+
+/**
+ * Response: Device awaits encryption passphrase
+ * @next PassphraseAck
+ * @next Cancel
+ */
+ message PassphraseRequest {
+    optional bool on_device = 1;    // passphrase is being entered on the device
+}
+
+/**
+ * Request: Send passphrase back
+ * @prev PassphraseRequest
+ * @next PassphraseStateRequest
+ */
+message PassphraseAck {
+    optional string passphrase = 1;
+    optional bytes state = 2;       // expected device state
+}
+
+/**
+ * @prev PassphraseAck
+ * @next PassphraseStateAck
+ */
+message PassphraseStateRequest {
+    optional bytes state = 1;       // actual device state
+}
+
+/**
+ * @prev PassphraseStateRequest
+ */
+message PassphraseStateAck {
+}
+
+/**
+ * Structure representing BIP32 (hierarchical deterministic) node
+ * Used for imports of private key into the device and exporting public key out of device
+ */
+message HDNodeType {
+    required uint32 depth = 1;
+    required uint32 fingerprint = 2;
+    required uint32 child_num = 3;
+    required bytes chain_code = 4;
+    optional bytes private_key = 5;
+    optional bytes public_key = 6;
+}

protob/messages-debug.proto

@@ -4,7 +4,7 @@ syntax = "proto2";
 option java_package = "com.satoshilabs.trezor.lib.protobuf";
 option java_outer_classname = "TrezorMessageDebug";
 
-import "common.proto";
+import "messages-common.proto";
 
 /**
  * Request: "Press" the button on the device

protob/messages-management.proto

@@ -4,7 +4,7 @@ syntax = "proto2";
 option java_package = "com.satoshilabs.trezor.lib.protobuf";
 option java_outer_classname = "TrezorMessageManagement";
 
-import "common.proto";
+import "messages-common.proto";
 
 /**
  * Request: Reset device to default state and ask for device details
@@ -116,97 +116,6 @@ message Ping {
     optional bool passphrase_protection = 4;    // ask for passphrase if set in device
 }
 
-/**
- * Response: Success of the previous request
- */
-message Success {
-    optional string message = 1;    // human readable description of action or request-specific payload
-}
-
-/**
-* Response: Failure of the previous request
-*/
-message Failure {
-    optional FailureType code = 1;  // computer-readable definition of the error state
-    optional string message = 2;    // human-readable message of the error state
-    enum FailureType {
-        Failure_UnexpectedMessage = 1;
-        Failure_ButtonExpected = 2;
-        Failure_DataError = 3;
-        Failure_ActionCancelled = 4;
-        Failure_PinExpected = 5;
-        Failure_PinCancelled = 6;
-        Failure_PinInvalid = 7;
-        Failure_InvalidSignature = 8;
-        Failure_ProcessError = 9;
-        Failure_NotEnoughFunds = 10;
-        Failure_NotInitialized = 11;
-        Failure_PinMismatch = 12;
-        Failure_FirmwareError = 99;
-    }
-}
-
-/**
- * Response: Device is waiting for HW button press.
- * @next ButtonAck
- * @next Cancel
- */
-message ButtonRequest {
-    optional ButtonRequestType code = 1;
-    optional string data = 2;
-    /**
-    * Type of button request
-    */
-    enum ButtonRequestType {
-        ButtonRequest_Other = 1;
-        ButtonRequest_FeeOverThreshold = 2;
-        ButtonRequest_ConfirmOutput = 3;
-        ButtonRequest_ResetDevice = 4;
-        ButtonRequest_ConfirmWord = 5;
-        ButtonRequest_WipeDevice = 6;
-        ButtonRequest_ProtectCall = 7;
-        ButtonRequest_SignTx = 8;
-        ButtonRequest_FirmwareCheck = 9;
-        ButtonRequest_Address = 10;
-        ButtonRequest_PublicKey = 11;
-        ButtonRequest_MnemonicWordCount = 12;
-        ButtonRequest_MnemonicInput = 13;
-        ButtonRequest_PassphraseType = 14;
-    }
-}
-
-/**
- * Request: Computer agrees to wait for HW button press
- * @prev ButtonRequest
- */
-message ButtonAck {
-}
-
-/**
- * Response: Device is asking computer to show PIN matrix and awaits PIN encoded using this matrix scheme
- * @next PinMatrixAck
- * @next Cancel
- */
-message PinMatrixRequest {
-    optional PinMatrixRequestType type = 1;
-    /**
-    * Type of PIN request
-    */
-    enum PinMatrixRequestType {
-        PinMatrixRequestType_Current = 1;
-        PinMatrixRequestType_NewFirst = 2;
-        PinMatrixRequestType_NewSecond = 3;
-    }
-}
-
-/**
- * Request: Computer responds with encoded PIN
- * @prev PinMatrixRequest
- */
-message PinMatrixAck {
-    required string pin = 1;    // matrix encoded PIN entered by user
-}
-
 /**
  * Request: Abort last operation that required user interaction
  * @prev ButtonRequest
@@ -216,39 +125,6 @@ message PinMatrixAck {
 message Cancel {
 }
 
-/**
- * Response: Device awaits encryption passphrase
- * @next PassphraseAck
- * @next Cancel
- */
-message PassphraseRequest {
-    optional bool on_device = 1;    // passphrase is being entered on the device
-}
-
-/**
- * Request: Send passphrase back
- * @prev PassphraseRequest
- * @next PassphraseStateRequest
- */
-message PassphraseAck {
-    optional string passphrase = 1;
-    optional bytes state = 2;       // expected device state
-}
-
-/**
- * @prev PassphraseAck
- * @next PassphraseStateAck
- */
-message PassphraseStateRequest {
-    optional bytes state = 1;       // actual device state
-}
-
-/**
- * @prev PassphraseStateRequest
- */
-message PassphraseStateAck {
-}
-
 /**
  * Request: Request a sample of random data generated by hardware RNG. May be used for testing.
  * @next ButtonRequest