Merge pull request #642 from tronprotocol/develop-evan-merageproto

Develop evan merageproto

Author: renchenchang

src/main/java/org/tron/common/overlay/client/WalletGrpcClient.java

@@ -3,17 +3,23 @@
 import com.google.protobuf.ByteString;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import org.tron.api.GrpcAPI.*;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import org.tron.api.GrpcAPI.AccountList;
+import org.tron.api.GrpcAPI.AssetIssueList;
+import org.tron.api.GrpcAPI.BytesMessage;
+import org.tron.api.GrpcAPI.EmptyMessage;
+import org.tron.api.GrpcAPI.NodeList;
+import org.tron.api.GrpcAPI.NumberMessage;
+import org.tron.api.GrpcAPI.Return;
+import org.tron.api.GrpcAPI.WitnessList;
 import org.tron.api.WalletGrpc;
 import org.tron.protos.Contract;
 import org.tron.protos.Contract.AssetIssueContract;
 import org.tron.protos.Protocol.Account;
 import org.tron.protos.Protocol.Block;
 import org.tron.protos.Protocol.Transaction;
 
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
 public class WalletGrpcClient {
 
   private final ManagedChannel channel;
@@ -56,10 +62,6 @@ public Transaction createParticipateAssetIssueTransaction(
     return walletBlockingStub.participateAssetIssue(contract);
   }
 
-  public Transaction createAccount(Contract.AccountCreateContract contract) {
-    return walletBlockingStub.createAccount(contract);
-  }
-
   public Transaction createAssetIssue(AssetIssueContract contract) {
     return walletBlockingStub.createAssetIssue(contract);
   }

src/main/protos/api/api.proto

@@ -48,13 +48,6 @@ service Wallet {
     };
   };
 
-  rpc CreateAccount (AccountCreateContract) returns (Transaction) {
-    option (google.api.http) = {
-      post: "/wallet/createaccount"
-      body: "*"
-    };
-  };
-
   rpc VoteWitnessAccount (VoteWitnessContract) returns (Transaction) {
     option (google.api.http) = {
       post: "/wallet/votewitnessaccount"

src/test/java/stest/tron/wallet/common/GrpcClient.java

@@ -62,10 +62,6 @@ public Transaction createParticipateAssetIssueTransaction(
         return blockingStub.participateAssetIssue(contract);
     }
 
-    public Transaction createAccount(Contract.AccountCreateContract contract) {
-        return blockingStub.createAccount(contract);
-    }
-
     public Transaction createAssetIssue(Contract.AssetIssueContract contract) {
         return blockingStub.createAssetIssue(contract);
     }