Skip to content

Commit da7abeb

Browse files
CodeNinjaEvanCodeNinjaEvan
committed
fix:remove api.
1 parent 37497a5 commit da7abeb

2 files changed

Lines changed: 34 additions & 84 deletions

File tree

‎src/main/protos/api/api.proto‎

Lines changed: 9 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ service Wallet {
9393
};
9494

9595
rpc CreateWitness (WitnessCreateContract) returns (Transaction) {
96-
option (google.api.http) = {
97-
post: "/wallet/createwitness"
98-
body: "*"
99-
additional_bindings {
100-
get: "/wallet/createwitness"
101-
}
102-
};
96+
option (google.api.http) = {
97+
post: "/wallet/createwitness"
98+
body: "*"
99+
additional_bindings {
100+
get: "/wallet/createwitness"
101+
}
103102
};
103+
};
104104

105105
rpc TransferAsset (TransferAssetContract) returns (Transaction) {
106106
option (google.api.http) = {
@@ -192,14 +192,14 @@ service Wallet {
192192
};
193193
}
194194
rpc GetAccountNet (Account) returns (AccountNetMessage) {
195-
option (google.api.http) = {
195+
option (google.api.http) = {
196196
post: "/wallet/getaccountnet"
197197
body: "*"
198198
additional_bindings {
199199
get: "/wallet/getaccountnet"
200200
}
201201
};
202-
};
202+
};
203203
rpc GetAssetIssueByName (BytesMessage) returns (AssetIssueContract) {
204204
option (google.api.http) = {
205205
post: "/wallet/getassetissuebyname"
@@ -333,33 +333,6 @@ service WalletSolidity {
333333
}
334334
};
335335
}
336-
rpc GetAssetIssueListByTimestamp (NumberMessage) returns (AssetIssueList) {
337-
option (google.api.http) = {
338-
post: "/walletsolidity/getassetissuelistbytimestamp"
339-
body: "*"
340-
additional_bindings {
341-
get: "/walletsolidity/getassetissuelistbytimestamp"
342-
}
343-
};
344-
}
345-
rpc GetAssetIssueByAccount (Account) returns (AssetIssueList) {
346-
option (google.api.http) = {
347-
post: "/walletsolidity/getassetissuebyaccount"
348-
body: "*"
349-
additional_bindings {
350-
get: "/walletsolidity/getassetissuebyaccount"
351-
}
352-
};
353-
}
354-
rpc GetAssetIssueByName (BytesMessage) returns (AssetIssueContract) {
355-
option (google.api.http) = {
356-
post: "/walletsolidity/getassetissuebyname"
357-
body: "*"
358-
additional_bindings {
359-
get: "/walletsolidity/getassetissuebyname"
360-
}
361-
};
362-
}
363336
rpc GetNowBlock (EmptyMessage) returns (Block) {
364337
option (google.api.http) = {
365338
post: "/walletsolidity/getnowblock"
@@ -378,25 +351,6 @@ service WalletSolidity {
378351
}
379352
};
380353
}
381-
//get transaction
382-
rpc TotalTransaction (EmptyMessage) returns (NumberMessage) {
383-
option (google.api.http) = {
384-
post: "/walletsolidity/totaltransaction"
385-
body: "*"
386-
additional_bindings {
387-
get: "/walletsolidity/totaltransaction"
388-
}
389-
};
390-
}
391-
rpc GetTransactionById (BytesMessage) returns (Transaction) {
392-
option (google.api.http) = {
393-
post: "/walletsolidity/gettransactionbyid"
394-
body: "*"
395-
additional_bindings {
396-
get: "/walletsolidity/gettransactionbyid"
397-
}
398-
};
399-
}
400354
};
401355

402356
service WalletExtension {

‎src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue009.java‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,17 @@
33
import com.google.protobuf.ByteString;
44
import io.grpc.ManagedChannel;
55
import io.grpc.ManagedChannelBuilder;
6-
import java.util.Optional;
76
import java.util.concurrent.TimeUnit;
87
import lombok.extern.slf4j.Slf4j;
98
import org.apache.commons.lang3.StringUtils;
109
import org.spongycastle.util.encoders.Hex;
11-
import org.testng.Assert;
1210
import org.testng.annotations.AfterClass;
1311
import org.testng.annotations.BeforeClass;
1412
import org.testng.annotations.Test;
15-
import org.tron.api.GrpcAPI;
1613
import org.tron.api.GrpcAPI.NumberMessage;
1714
import org.tron.api.WalletGrpc;
1815
import org.tron.api.WalletSolidityGrpc;
1916
import org.tron.common.crypto.ECKey;
20-
import org.tron.protos.Contract;
2117
import org.tron.protos.Protocol.Account;
2218
import org.tron.protos.Protocol.Block;
2319
import org.tron.protos.Protocol.Transaction;
@@ -80,33 +76,33 @@ public void beforeClass() {
8076
@Test(enabled = true)
8177
public void testGetAssetIssueByAccountOrNameFromSolidity() {
8278
//By name
83-
ByteString addressBs = ByteString.copyFrom(FROM_ADDRESS);
84-
Account request = Account.newBuilder().setAddress(addressBs).build();
85-
GrpcAPI.AssetIssueList assetIssueList = blockingStubSolidity
86-
.getAssetIssueByAccount(request);
87-
Optional<GrpcAPI.AssetIssueList> queryAssetIssueByAccount = Optional.ofNullable(assetIssueList);
88-
logger.info(Integer.toString(queryAssetIssueByAccount.get().getAssetIssueCount()));
89-
Assert.assertTrue(queryAssetIssueByAccount.get().getAssetIssueCount() >= 1);
90-
for (Integer j = 0; j < queryAssetIssueByAccount.get().getAssetIssueCount(); j++) {
91-
Assert.assertTrue(queryAssetIssueByAccount.get().getAssetIssue(j).getTotalSupply() > 0);
92-
Assert.assertFalse(queryAssetIssueByAccount.get().getAssetIssue(j).getName().isEmpty());
93-
logger.info("TestGetAssetIssueByAccount in soliditynode ok!!!");
94-
95-
}
79+
// ByteString addressBs = ByteString.copyFrom(FROM_ADDRESS);
80+
// Account request = Account.newBuilder().setAddress(addressBs).build();
81+
// GrpcAPI.AssetIssueList assetIssueList = blockingStubSolidity
82+
// .getAssetIssueByAccount(request);
83+
// Optional<GrpcAPI.AssetIssueList> queryAssetIssueByAccount = Optional.ofNullable(assetIssueList);
84+
// logger.info(Integer.toString(queryAssetIssueByAccount.get().getAssetIssueCount()));
85+
// Assert.assertTrue(queryAssetIssueByAccount.get().getAssetIssueCount() >= 1);
86+
// for (Integer j = 0; j < queryAssetIssueByAccount.get().getAssetIssueCount(); j++) {
87+
// Assert.assertTrue(queryAssetIssueByAccount.get().getAssetIssue(j).getTotalSupply() > 0);
88+
// Assert.assertFalse(queryAssetIssueByAccount.get().getAssetIssue(j).getName().isEmpty());
89+
// logger.info("TestGetAssetIssueByAccount in soliditynode ok!!!");
90+
//
91+
// }
9692

9793
//By ID
98-
ByteString assetName = queryAssetIssueByAccount.get().getAssetIssue(0).getName();
99-
GrpcAPI.BytesMessage requestAsset = GrpcAPI.BytesMessage.newBuilder().setValue(assetName)
100-
.build();
101-
Contract.AssetIssueContract assetIssueByName = blockingStubSolidity
102-
.getAssetIssueByName(requestAsset);
103-
104-
Assert.assertFalse(assetIssueByName.getUrl().isEmpty());
105-
Assert.assertFalse(assetIssueByName.getDescription().isEmpty());
106-
Assert.assertTrue(assetIssueByName.getTotalSupply() > 0);
107-
Assert.assertTrue(assetIssueByName.getTrxNum() > 0);
108-
109-
logger.info("TestGetAssetIssueByNameFromSolidity");
94+
// ByteString assetName = queryAssetIssueByAccount.get().getAssetIssue(0).getName();
95+
// GrpcAPI.BytesMessage requestAsset = GrpcAPI.BytesMessage.newBuilder().setValue(assetName)
96+
// .build();
97+
// Contract.AssetIssueContract assetIssueByName = blockingStubSolidity
98+
// .getAssetIssueByName(requestAsset);
99+
//
100+
// Assert.assertFalse(assetIssueByName.getUrl().isEmpty());
101+
// Assert.assertFalse(assetIssueByName.getDescription().isEmpty());
102+
// Assert.assertTrue(assetIssueByName.getTotalSupply() > 0);
103+
// Assert.assertTrue(assetIssueByName.getTrxNum() > 0);
104+
//
105+
// logger.info("TestGetAssetIssueByNameFromSolidity");
110106
}
111107

112108
@AfterClass(enabled = true)

0 commit comments

Comments
 (0)