Merge pull request #3236 from tronprotocol/shielded_4.0_stest

wangzichichi · web-flow · commit 16b06d8f9215 · 2020-06-22T22:57:21.000+08:00
Add waiting time for stest case
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/HttpShieldTrc20Token003.java b/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/HttpShieldTrc20Token003.java
@@ -80,6 +80,7 @@ public void prepareForTransfer() {
             .getString("trigger_contract_input"),maxFeeLimit,0L,0,0L,
         zenTrc20TokenOwnerKey);
     HttpMethed.waitToProduceOneBlock(httpnode);
+    HttpMethed.waitToProduceOneBlock(httpnode);
 
   }
 
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/HttpShieldTrc20Token004.java b/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/HttpShieldTrc20Token004.java
@@ -79,7 +79,7 @@ public void prepareForTransfer() {
             .getString("trigger_contract_input"),maxFeeLimit,0L,0,0L,
         zenTrc20TokenOwnerKey);
     HttpMethed.waitToProduceOneBlock(httpnode);
-
+    HttpMethed.waitToProduceOneBlock(httpnode);
   }
 
 
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token002.java b/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token002.java
@@ -85,6 +85,7 @@ public void test01ShieldTrc20TransactionByTypeMint() throws Exception {
         mint, data, true, 0, maxFeeLimit, zenTrc20TokenOwnerAddress,
         zenTrc20TokenOwnerKey, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
 
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token003.java b/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token003.java
@@ -71,6 +71,7 @@ public void beforeClass() throws Exception {
     String txid = PublicMethed.triggerContract(shieldAddressByte,
         mint, data, true, 0, maxFeeLimit, zenTrc20TokenOwnerAddress,
         zenTrc20TokenOwnerKey, blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     PublicMethed.waitSolidityNodeSynFullNodeData(blockingStubFull,blockingStubSolidity);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
@@ -116,6 +117,7 @@ public void test01ShieldTrc20TransactionWithTypeTransfer() throws Exception {
         transfer, data, true, 0, maxFeeLimit, zenTrc20TokenOwnerAddress,
         zenTrc20TokenOwnerKey, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     Assert.assertTrue(infoById.get().getReceipt().getResultValue() == 1);
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token004.java b/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token004.java
@@ -84,6 +84,7 @@ public void beforeClass() throws Exception {
         mint, data, true, 0, maxFeeLimit, zenTrc20TokenOwnerAddress,
         zenTrc20TokenOwnerKey, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     Assert.assertTrue(infoById.get().getReceipt().getResultValue() == 1);
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token005.java b/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token005.java
@@ -82,6 +82,7 @@ public void beforeClass() throws Exception {
         mint, data, true, 0, maxFeeLimit, zenTrc20TokenOwnerAddress,
         zenTrc20TokenOwnerKey, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     Assert.assertTrue(infoById.get().getReceipt().getResultValue() == 1);
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token006.java b/framework/src/test/java/stest/tron/wallet/dailybuild/zentrc20token/ShieldTrc20Token006.java
@@ -82,6 +82,7 @@ public void beforeClass() throws Exception {
         mint, data, true, 0, maxFeeLimit, zenTrc20TokenOwnerAddress,
         zenTrc20TokenOwnerKey, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     Assert.assertTrue(infoById.get().getReceipt().getResultValue() == 1);

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public void prepareForTransfer() {`
`80`	`80`	`.getString("trigger_contract_input"),maxFeeLimit,0L,0,0L,`
`81`	`81`	`zenTrc20TokenOwnerKey);`
`82`	`82`	`HttpMethed.waitToProduceOneBlock(httpnode);`
	`83`	`+ HttpMethed.waitToProduceOneBlock(httpnode);`
`83`	`84`
`84`	`85`	`}`
`85`	`86`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void prepareForTransfer() {`
`79`	`79`	`.getString("trigger_contract_input"),maxFeeLimit,0L,0,0L,`
`80`	`80`	`zenTrc20TokenOwnerKey);`
`81`	`81`	`HttpMethed.waitToProduceOneBlock(httpnode);`
`82`		`-`
	`82`	`+ HttpMethed.waitToProduceOneBlock(httpnode);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`