Merge commit 'aee676f4629380ccca1ff1b7114010d8a54fac8b' into feature/Process_actuator

sean-liu55 · sean-liu55 · commit 357d62d467e7 · 2018-03-08T18:05:15.000+08:00
diff --git a/src/main/protos/api/api.proto b/src/main/protos/api/api.proto
@@ -20,7 +20,7 @@ service Wallet {
 
   };
 
-  rpc ListAccounts (NullMessage) returns (AccountList) {
+  rpc ListAccounts (EmptyMessage) returns (AccountList) {
 
   };
 
@@ -36,7 +36,7 @@ service Wallet {
 
   };
 
-  rpc ListWitnesses (NullMessage) returns (WitnessList) {
+  rpc ListWitnesses (EmptyMessage) returns (WitnessList) {
 
   };
 
@@ -49,3 +49,14 @@ service Wallet {
 message Return {
   bool result = 1;
 }
+
+message AccountList{
+  repeated Account accounts = 1;
+}
+
+message WitnessList{
+  repeated Witness witnesses = 1;
+}
+
+message EmptyMessage{
+}
diff --git a/src/main/protos/core/Tron.proto b/src/main/protos/core/Tron.proto
@@ -6,7 +6,7 @@ package protocol;
 
 
 option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file
-option java_outer_classname = "Protocal"; //Specify the class name of the generated Java file
+option java_outer_classname = "Protocol"; //Specify the class name of the generated Java file
 
 
 enum AccountType {
@@ -21,18 +21,15 @@ message Account {
     bytes vote_address = 1;
     int64 vote_count = 2;
   }
-  bytes accout_name = 1;
+  bytes account_name = 1;
   AccountType type = 2;
   bytes address = 3;
   int64 balance = 4;
   repeated Vote votes = 5;
   map<string, int64> asset = 6;
-
 }
 
-message AccountList{
-  repeated Account accounts = 1;
-}
+
 
 // Witness
 message Witness {
@@ -45,12 +42,6 @@ message Witness {
   int64 latestBlockNum = 7;
 }
 
-message WitnessList{
-  repeated Witness witnesses = 1;
-}
-
-message NullMessage{
-}
 
 // Transcation
 
@@ -59,7 +50,6 @@ message TXOutput {
   bytes pubKeyHash = 2;
 }
 
-
 message TXInput {
   message raw {
     bytes txID = 1;
@@ -68,15 +58,14 @@ message TXInput {
   }
   raw raw_data = 1;
   bytes signature = 4;
-
 }
 
 message TXOutputs {
   repeated TXOutput outputs = 1;
 }
 
 message Transaction {
-  enum TranscationType {
+  enum TransactionType {
     UtxoType = 0;
     ContractType = 1;
   }
@@ -95,7 +84,7 @@ message Transaction {
     google.protobuf.Any parameter = 2;
   }
   message raw {
-    TranscationType type = 2;
+    TransactionType type = 2;
     repeated TXInput vin = 5;
     repeated TXOutput vout = 7;
     int64 expiration = 8;
@@ -123,14 +112,12 @@ message BlockHeader {
 }
 
 // block
-
 message Block {
   repeated Transaction transactions = 1;
   BlockHeader block_header = 2;
 }
 
 // Inventory
-
 message BlockInventory {
   enum Type {
     SYNC = 0;
diff --git a/src/main/protos/core/TronInventoryItems.proto b/src/main/protos/core/TronInventoryItems.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package protocal;
+package protocol;
 
 option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file
 option java_outer_classname = "TronInventoryItems"; //Specify the class name of the generated Java file
