fix merge conflict

tronprotocol · May 9, 2018 · 3913331 · 3913331
2 parents bb1f7e0 + 4e0f34e
commit 3913331
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/api/api.proto b/api/api.proto
@@ -16,6 +16,9 @@ service Wallet {
     option (google.api.http) = {
       post: "/wallet/getaccount"
       body: "*"
+      additional_bindings {
+        get: "/wallet/getaccount"
+      }
     };
   };
 
@@ -35,8 +38,11 @@ service Wallet {
 
   rpc ListAccounts (EmptyMessage) returns (AccountList) {
     option (google.api.http) = {
-          post: "/wallet/listaccount"
-          body: "*"
+      post: "/wallet/listaccount"
+      body: "*"
+      additional_bindings {
+        get: "/wallet/listaccount"
+      }
     };
   };
 
@@ -65,6 +71,9 @@ service Wallet {
     option (google.api.http) = {
       post: "/wallet/listwitnesses"
       body: "*"
+      additional_bindings {
+        get: "/wallet/listwitnesses"
+      }
     };
   };
 
@@ -121,12 +130,18 @@ service Wallet {
     option (google.api.http) = {
       post: "/wallet/listnodes"
       body: "*"
+      additional_bindings {
+        get: "/wallet/listnodes"
+      }
     };
   }
   rpc GetAssetIssueList (EmptyMessage) returns (AssetIssueList) {
     option (google.api.http) = {
       post: "/wallet/getassetissuelist"
       body: "*"
+      additional_bindings {
+        get: "/wallet/getassetissuelist"
+      }
     };
   }
   rpc GetAssetIssueByAccount (Account) returns (AssetIssueList) {
@@ -145,18 +160,27 @@ service Wallet {
     option (google.api.http) = {
       post: "/wallet/getnowblock"
       body: "*"
+      additional_bindings {
+        get: "/wallet/getnowblock"
+      }
     };
   }
   rpc GetBlockByNum (NumberMessage) returns (Block) {
     option (google.api.http) = {
       post: "/wallet/getblockbynum"
       body: "*"
+      additional_bindings {
+        get: "/wallet/getblockbynum"
+      }
     };
   }
   rpc TotalTransaction (EmptyMessage) returns (NumberMessage) {
     option (google.api.http) = {
       post: "/wallet/totaltransaction"
       body: "*"
+      additional_bindings {
+        get: "/wallet/totaltransaction"
+      }
     };
   }
   rpc GetBlockById (BytesMessage) returns (Block) {