Skip to content

master #1453

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 4 commits into from
Sep 5, 2018
Merged

master #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6afda7
optimization stest case
Sep 4, 2018
b816fc6
Merge pull request #1440 from tronprotocol/stest_adapt_deploy_contrac…
pangpangfeng Sep 5, 2018
3df5b28
cancal the stest tmp
Sep 5, 2018
1179429
Merge pull request #1454 from tronprotocol/cancel_stest_tmp
wangzichichi Sep 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
4 changes: 2 additions & 2 deletions deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
ssh tron@47.93.9.236 -p 22008 sh /home/tron/workspace/deploy_all.sh
./gradlew stest
#ssh tron@47.93.9.236 -p 22008 sh /home/tron/workspace/deploy_all.sh
#./gradlew stest
8 changes: 6 additions & 2 deletions src/test/java/stest/tron/wallet/account/WalletTestAccount006.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void beforeSuite() {

@BeforeClass(enabled = true)
public void beforeClass() {
logger.info(account006Key);
PublicMethed.printAddress(account006Key);

channelFull = ManagedChannelBuilder.forTarget(fullnode)
.usePlaintext(true)
Expand Down Expand Up @@ -95,6 +95,7 @@ public void testGetAccountNet() {
Assert.assertTrue(accountNetMessage.getFreeNetUsed() == 0);
Assert.assertTrue(accountNetMessage.getTotalNetLimit() > 0);
Assert.assertTrue(accountNetMessage.getTotalNetWeight() > 0);
logger.info("testGetAccountNet");

}

Expand All @@ -110,6 +111,7 @@ public void testUseFreeNet() {
//Every transaction may cost 200 net.
Assert.assertTrue(accountNetMessage.getFreeNetUsed() > 0 && accountNetMessage
.getFreeNetUsed() < 300);
logger.info("testUseFreeNet");
}

@Test(enabled = true)
Expand All @@ -120,7 +122,8 @@ public void testUseMoneyToDoTransaction() {
Account request = Account.newBuilder().setAddress(addressBs).build();
AccountNetMessage accountNetMessage = blockingStubFull.getAccountNet(request);
//Use out the free net
while (accountNetMessage.getFreeNetUsed() < BASELINE) {
Integer times = 0;
while (accountNetMessage.getFreeNetUsed() < BASELINE && times++ < 30) {
PublicMethed.sendcoin(fromAddress,1L,account006Address,account006Key,
blockingStubFull);
accountNetMessage = blockingStubFull.getAccountNet(request);
Expand All @@ -134,6 +137,7 @@ public void testUseMoneyToDoTransaction() {
Long afterSendBalance = queryAccount.getBalance();
//when the free net is not enough and no balance freeze, use money to do the transaction.
Assert.assertTrue(beforeSendBalance - afterSendBalance > 1);
logger.info("testUseMoneyToDoTransaction");
}

@Test(enabled = true)
Expand Down