Skip to content

Commit 8404777

Browse files
author
Sunny Jiao
committed
fix grpc release
1 parent e4d2622 commit 8404777

File tree

4 files changed

+77
-306
lines changed

4 files changed

+77
-306
lines changed

‎framework/src/test/java/org/tron/core/CreateCommonTransactionTest.java‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,35 @@ public class CreateCommonTransactionTest {
2222
* for example create UpdateBrokerageContract
2323
*/
2424
public static void testCreateUpdateBrokerageContract() {
25-
WalletBlockingStub walletStub = WalletGrpc
26-
.newBlockingStub(ManagedChannelBuilder.forTarget(FULL_NODE).usePlaintext().build());
27-
UpdateBrokerageContract.Builder updateBrokerageContract = UpdateBrokerageContract.newBuilder();
28-
updateBrokerageContract.setOwnerAddress(
29-
ByteString.copyFrom(decodeFromBase58Check("TN3zfjYUmMFK3ZsHSsrdJoNRtGkQmZLBLz")))
30-
.setBrokerage(10);
31-
Transaction.Builder transaction = Transaction.newBuilder();
32-
raw.Builder raw = Transaction.raw.newBuilder();
33-
Contract.Builder contract = Contract.newBuilder();
34-
contract.setType(ContractType.UpdateBrokerageContract)
35-
.setParameter(Any.pack(updateBrokerageContract.build()));
36-
raw.addContract(contract.build());
37-
transaction.setRawData(raw.build());
38-
TransactionExtention transactionExtention = walletStub
39-
.createCommonTransaction(transaction.build());
40-
System.out.println("Common UpdateBrokerage: " + transactionExtention);
25+
io.grpc.ManagedChannel channel = ManagedChannelBuilder.forTarget(FULL_NODE).usePlaintext().build();
26+
try {
27+
WalletBlockingStub walletStub = WalletGrpc.newBlockingStub(channel);
28+
UpdateBrokerageContract.Builder updateBrokerageContract = UpdateBrokerageContract.newBuilder();
29+
updateBrokerageContract.setOwnerAddress(
30+
ByteString.copyFrom(decodeFromBase58Check("TN3zfjYUmMFK3ZsHSsrdJoNRtGkQmZLBLz")))
31+
.setBrokerage(10);
32+
Transaction.Builder transaction = Transaction.newBuilder();
33+
raw.Builder raw = Transaction.raw.newBuilder();
34+
Contract.Builder contract = Contract.newBuilder();
35+
contract.setType(ContractType.UpdateBrokerageContract)
36+
.setParameter(Any.pack(updateBrokerageContract.build()));
37+
raw.addContract(contract.build());
38+
transaction.setRawData(raw.build());
39+
TransactionExtention transactionExtention = walletStub
40+
.createCommonTransaction(transaction.build());
41+
System.out.println("Common UpdateBrokerage: " + transactionExtention);
42+
} finally {
43+
// Properly shutdown the gRPC channel to prevent resource leaks
44+
channel.shutdown();
45+
try {
46+
if (!channel.awaitTermination(5, java.util.concurrent.TimeUnit.SECONDS)) {
47+
channel.shutdownNow();
48+
}
49+
} catch (InterruptedException e) {
50+
channel.shutdownNow();
51+
Thread.currentThread().interrupt();
52+
}
53+
}
4154
}
4255

4356
public static void main(String[] args) {

‎framework/src/test/java/org/tron/core/services/DelegationServiceTest.java‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,35 @@ public DelegationServiceTest(TronApplicationContext context) {
3131
}
3232

3333
public static void testGrpc() {
34-
WalletBlockingStub walletStub = WalletGrpc
35-
.newBlockingStub(ManagedChannelBuilder.forTarget(fullnode)
36-
.usePlaintext()
37-
.build());
38-
BytesMessage.Builder builder = BytesMessage.newBuilder();
39-
builder.setValue(ByteString.copyFromUtf8("TLTDZBcPoJ8tZ6TTEeEqEvwYFk2wgotSfD"));
40-
System.out
41-
.println("getBrokerageInfo: " + walletStub.getBrokerageInfo(builder.build()).getNum());
42-
System.out.println("getRewardInfo: " + walletStub.getRewardInfo(builder.build()).getNum());
43-
UpdateBrokerageContract.Builder updateBrokerageContract = UpdateBrokerageContract.newBuilder();
44-
updateBrokerageContract.setOwnerAddress(
45-
ByteString.copyFrom(decodeFromBase58Check("TN3zfjYUmMFK3ZsHSsrdJoNRtGkQmZLBLz")))
46-
.setBrokerage(10);
47-
TransactionExtention transactionExtention = walletStub
48-
.updateBrokerage(updateBrokerageContract.build());
49-
System.out.println("UpdateBrokerage: " + transactionExtention);
34+
io.grpc.ManagedChannel channel = ManagedChannelBuilder.forTarget(fullnode)
35+
.usePlaintext()
36+
.build();
37+
try {
38+
WalletBlockingStub walletStub = WalletGrpc.newBlockingStub(channel);
39+
BytesMessage.Builder builder = BytesMessage.newBuilder();
40+
builder.setValue(ByteString.copyFromUtf8("TLTDZBcPoJ8tZ6TTEeEqEvwYFk2wgotSfD"));
41+
System.out
42+
.println("getBrokerageInfo: " + walletStub.getBrokerageInfo(builder.build()).getNum());
43+
System.out.println("getRewardInfo: " + walletStub.getRewardInfo(builder.build()).getNum());
44+
UpdateBrokerageContract.Builder updateBrokerageContract = UpdateBrokerageContract.newBuilder();
45+
updateBrokerageContract.setOwnerAddress(
46+
ByteString.copyFrom(decodeFromBase58Check("TN3zfjYUmMFK3ZsHSsrdJoNRtGkQmZLBLz")))
47+
.setBrokerage(10);
48+
TransactionExtention transactionExtention = walletStub
49+
.updateBrokerage(updateBrokerageContract.build());
50+
System.out.println("UpdateBrokerage: " + transactionExtention);
51+
} finally {
52+
// Properly shutdown the gRPC channel to prevent resource leaks
53+
channel.shutdown();
54+
try {
55+
if (!channel.awaitTermination(5, java.util.concurrent.TimeUnit.SECONDS)) {
56+
channel.shutdownNow();
57+
}
58+
} catch (InterruptedException e) {
59+
channel.shutdownNow();
60+
Thread.currentThread().interrupt();
61+
}
62+
}
5063
}
5164

5265
private void testPay(int cycle) {

‎framework/src/test/java/org/tron/core/services/WalletApiTest.java‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,25 @@ public static void init() throws IOException {
4545
public void listNodesTest() {
4646
String fullNode = String.format("%s:%d", "127.0.0.1",
4747
Args.getInstance().getRpcPort());
48-
WalletGrpc.WalletBlockingStub walletStub = WalletGrpc
49-
.newBlockingStub(ManagedChannelBuilder.forTarget(fullNode)
50-
.usePlaintext()
51-
.build());
52-
Assert.assertTrue(walletStub.listNodes(EmptyMessage.getDefaultInstance())
53-
.getNodesList().isEmpty());
48+
io.grpc.ManagedChannel channel = ManagedChannelBuilder.forTarget(fullNode)
49+
.usePlaintext()
50+
.build();
51+
try {
52+
WalletGrpc.WalletBlockingStub walletStub = WalletGrpc.newBlockingStub(channel);
53+
Assert.assertTrue(walletStub.listNodes(EmptyMessage.getDefaultInstance())
54+
.getNodesList().isEmpty());
55+
} finally {
56+
// Properly shutdown the gRPC channel to prevent resource leaks
57+
channel.shutdown();
58+
try {
59+
if (!channel.awaitTermination(5, java.util.concurrent.TimeUnit.SECONDS)) {
60+
channel.shutdownNow();
61+
}
62+
} catch (InterruptedException e) {
63+
channel.shutdownNow();
64+
Thread.currentThread().interrupt();
65+
}
66+
}
5467
}
5568

5669
@After

0 commit comments

Comments
 (0)