Skip to content

Develop evan merageproto #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 5, 2018
Merged

Develop evan merageproto #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8aeba00
rm transaction type
zergweak May 3, 2018
e13211c
Merge pull request #38 from tronprotocol/evan-rm-transaction-type
olenheim May 3, 2018
d57ad8f
remove createaccount api
zergweak May 4, 2018
0e65a14
Merge pull request #39 from tronprotocol/evan-rm-createaccount
renchenchang May 5, 2018
a967df7
rm create account api
zergweak May 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/main/java/org/tron/common/overlay/client/WalletGrpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
7 changes: 0 additions & 7 deletions src/main/protos/api/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions src/test/java/stest/tron/wallet/common/GrpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down