Skip to content

Commit 70825eb

Browse files
authored
Merge pull request #5103 from tronprotocol/feature/grpc
feat(grpc) : use usePlaintext() to remove deprecated warning
2 parents 2b3b9e6 + d07e897 commit 70825eb

473 files changed

Lines changed: 783 additions & 783 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/implement-a-customized-actuator-en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public class SumActuatorTest {
234234
appTest.startServices();
235235
appTest.startup();
236236
channelFull = ManagedChannelBuilder.forTarget(serviceNode)
237-
.usePlaintext(true)
237+
.usePlaintext()
238238
.build();
239239
blockingStubFull = WalletGrpc.newBlockingStub(channelFull);
240240
}

docs/implement-a-customized-actuator-zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public class SumActuatorTest {
236236
appTest.startServices();
237237
appTest.startup();
238238
channelFull = ManagedChannelBuilder.forTarget(serviceNode)
239-
.usePlaintext(true)
239+
.usePlaintext()
240240
.build();
241241
blockingStubFull = WalletGrpc.newBlockingStub(channelFull);
242242
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class CreateCommonTransactionTest {
2323
*/
2424
public static void testCreateUpdateBrokerageContract() {
2525
WalletBlockingStub walletStub = WalletGrpc
26-
.newBlockingStub(ManagedChannelBuilder.forTarget(FULL_NODE).usePlaintext(true).build());
26+
.newBlockingStub(ManagedChannelBuilder.forTarget(FULL_NODE).usePlaintext().build());
2727
UpdateBrokerageContract.Builder updateBrokerageContract = UpdateBrokerageContract.newBuilder();
2828
updateBrokerageContract.setOwnerAddress(
2929
ByteString.copyFrom(decodeFromBase58Check("TN3zfjYUmMFK3ZsHSsrdJoNRtGkQmZLBLz")))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public DelegationServiceTest(TronApplicationContext context) {
3333
public static void testGrpc() {
3434
WalletBlockingStub walletStub = WalletGrpc
3535
.newBlockingStub(ManagedChannelBuilder.forTarget(fullnode)
36-
.usePlaintext(true)
36+
.usePlaintext()
3737
.build());
3838
BytesMessage.Builder builder = BytesMessage.newBuilder();
3939
builder.setValue(ByteString.copyFromUtf8("TLTDZBcPoJ8tZ6TTEeEqEvwYFk2wgotSfD"));

framework/src/test/java/org/tron/core/services/NodeInfoServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void test() {
4444
public void testGrpc() {
4545
WalletBlockingStub walletStub = WalletGrpc
4646
.newBlockingStub(ManagedChannelBuilder.forTarget(fullnode)
47-
.usePlaintext(true)
47+
.usePlaintext()
4848
.build());
4949
logger.info("getNodeInfo: {}", walletStub.getNodeInfo(EmptyMessage.getDefaultInstance()));
5050
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void init() {
4444
public void listNodesTest() {
4545
WalletGrpc.WalletBlockingStub walletStub = WalletGrpc
4646
.newBlockingStub(ManagedChannelBuilder.forTarget(fullnode)
47-
.usePlaintext(true)
47+
.usePlaintext()
4848
.build());
4949
Assert.assertTrue(walletStub.listNodes(EmptyMessage.getDefaultInstance())
5050
.getNodesList().size() == 0);

framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ public void init() {
6363
String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
6464
Args.getInstance().getRpcOnPBFTPort());
6565
channelFull = ManagedChannelBuilder.forTarget(fullnode)
66-
.usePlaintext(true)
66+
.usePlaintext()
6767
.build();
6868
channelpBFT = ManagedChannelBuilder.forTarget(pBFTNode)
69-
.usePlaintext(true)
69+
.usePlaintext()
7070
.build();
7171
context = new TronApplicationContext(DefaultConfig.class);
7272
blockingStubFull = WalletGrpc.newBlockingStub(channelFull);

framework/src/test/java/org/tron/program/LiteFullNodeToolTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ public void startApp() {
4848
appTest.startup();
4949

5050
String fullNode = String.format("%s:%d", "127.0.0.1",
51-
Args.getInstance().getRpcPort());
52-
ManagedChannel channelFull = ManagedChannelBuilder.forTarget(fullNode)
53-
.usePlaintext()
54-
.build();
51+
Args.getInstance().getRpcPort());
52+
channelFull = ManagedChannelBuilder.forTarget(fullNode)
53+
.usePlaintext()
54+
.build();
5555
blockingStubFull = WalletGrpc.newBlockingStub(channelFull);
5656
}
5757

framework/src/test/java/stest/tron/wallet/account/BrokerageTest001.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@ public class BrokerageTest001 {
5353
public void beforeClass() {
5454

5555
channelFull = ManagedChannelBuilder.forTarget(fullnode)
56-
.usePlaintext(true)
56+
.usePlaintext()
5757
.build();
5858
blockingStubFull = WalletGrpc.newBlockingStub(channelFull);
5959

6060
channelSolidity = ManagedChannelBuilder.forTarget(soliditynode)
61-
.usePlaintext(true)
61+
.usePlaintext()
6262
.build();
6363
blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelSolidity);
6464

6565
channelSoliInFull = ManagedChannelBuilder.forTarget(soliInFullnode)
66-
.usePlaintext(true)
66+
.usePlaintext()
6767
.build();
6868
blockingStubSoliInFull = WalletSolidityGrpc.newBlockingStub(channelSoliInFull);
6969

7070
channelPbft = ManagedChannelBuilder.forTarget(soliInPbft)
71-
.usePlaintext(true)
71+
.usePlaintext()
7272
.build();
7373
blockingStubPbft = WalletSolidityGrpc.newBlockingStub(channelPbft);
7474

framework/src/test/java/stest/tron/wallet/account/WalletTestAccount001.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public class WalletTestAccount001 {
5050
@BeforeClass
5151
public void beforeClass() {
5252
channelFull = ManagedChannelBuilder.forTarget(fullnode)
53-
.usePlaintext(true)
53+
.usePlaintext()
5454
.build();
5555
blockingStubFull = WalletGrpc.newBlockingStub(channelFull);
5656

5757
channelSolidity = ManagedChannelBuilder.forTarget(soliditynode)
58-
.usePlaintext(true)
58+
.usePlaintext()
5959
.build();
6060
blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelSolidity);
6161
}

0 commit comments

Comments
 (0)