Skip to content

Commit 8c95742

Browse files
author
wangzihe
committed
Replace the docker server ip
1 parent f87e185 commit 8c95742

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

deploy.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
33
stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
44
stest_server=""
5-
docker_num_in_67=`ssh -p 22008 -t java-tron@47.94.231.67 'docker ps -a | wc -l'`
5+
docker_num_in_67=`ssh -p 22008 -t java-tron@47.93.18.60 'docker ps -a | wc -l'`
66
docker_num_in_67=`echo $docker_num_in_67 | tr -d "\r"`
7-
docker_num_in_122=`ssh -p 22008 -t java-tron@47.94.10.122 'docker ps -a | wc -l'`
7+
docker_num_in_122=`ssh -p 22008 -t java-tron@47.93.42.145 'docker ps -a | wc -l'`
88
docker_num_in_122=`echo $docker_num_in_122 | tr -d "\r"`
99
if [ $docker_num_in_67 -le $docker_num_in_122 ];
1010
then
1111
docker_num=$docker_num_in_67
12-
stest_server=47.94.231.67
12+
stest_server=47.93.18.60
1313
else
1414
docker_num=$docker_num_in_122
15-
stest_server=47.94.10.122
15+
stest_server=47.93.42.145
1616
fi
1717

1818
if [[ ${docker_num} -le 3 ]];

src/test/java/stest/tron/wallet/account/WalletTestAccount013.java

+1
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ public void test5DelegateResourceAboutTriggerContract() {
394394
//sendcoin to Account6
395395
Assert.assertTrue(PublicMethed.sendcoin(accountForDeployAddress,
396396
10000000000L, fromAddress, testKey002, blockingStubFull));
397+
PublicMethed.waitProduceNextBlock(blockingStubFull);
397398

398399
//deploy contract under Account6
399400
Integer consumeUserResourcePercent = 0;

src/test/resources/testng.conf

+15-7
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ net {
66
fullnode = {
77
ip.list = [
88
#Docker env
9-
"127.0.0.1:50051",
10-
"127.0.0.1:50052",
9+
#"127.0.0.1:50051",
10+
#"127.0.0.1:50052",
1111
#Continue Integration
1212
//"47.93.14.253:50051",
1313
#"101.200.51.70:50051",
@@ -20,6 +20,9 @@ fullnode = {
2020
#Replay env
2121
#"47.94.239.172:50051",
2222
#"39.105.89.183:50051",
23+
#New beat1
24+
"39.106.145.222:50052",
25+
"101.200.46.37:50052",
2326

2427
#New beta1
2528
"47.94.197.215:50051",
@@ -43,23 +46,28 @@ fullnode = {
4346
solidityNode = {
4447
ip.list = [
4548
#Docker env
46-
"127.0.0.1:50053",
47-
"127.0.0.1:50062",
49+
#"127.0.0.1:50053",
50+
#"127.0.0.1:50062",
4851
#MainNet
4952
#"39.105.66.80:50051",
5053
#Continue Integration
5154
#"47.94.135.251:50051",
5255
#"47.94.9.222:50061",
5356
#new beta1
54-
#"47.94.197.215:18895",
57+
"101.200.46.37:50053",
58+
"101.200.46.37:50062",
59+
5560
#new beta2
56-
#"101.200.52.146:18895",
61+
"101.200.52.146:18895",
5762

5863
]
5964
}
6065

6166
httpnode = {
6267
ip.list = [
68+
"101.200.46.37:50191",
69+
"39.106.145.222:50093",
70+
"101.200.46.37:50094",
6371
#"39.105.89.183:8090",
6472
#"39.107.248.113:8090",
6573
#"39.105.89.183:8091",
@@ -159,7 +167,7 @@ defaultParameter = {
159167
delayTransactionFee = 100000
160168
cancleDelayTransactionFee = 50000
161169
solidityCompilerVersion = "v5"
162-
solidityCompile = "solcDIR/solc"
170+
solidityCompile = "/Users/wangzihe/Downloads/solc.0.5.4"
163171

164172
}
165173

0 commit comments

Comments
 (0)