diff --git a/framework/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java b/framework/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java index d28f9e57f32..b11160e7d97 100644 --- a/framework/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java +++ b/framework/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java @@ -6942,7 +6942,6 @@ public static Map getAllowance2(Long startNum, Long endNum, WalletGrpc.WalletBlockingStub blockingStubFull) { final String blackHole = Configuration.getByPath("testng.conf") .getString("defaultParameter.blackHoleAddress"); - Long balanceBlackHole = 0L; Long totalCount = 0L; Map witnessBlockCount = new HashMap<>(); Map witnessBrokerage = new HashMap<>(); @@ -6973,23 +6972,11 @@ public static Map getAllowance2(Long startNum, Long endNum, logger.info("----ss txid:" + txid); infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull); - Long energyFee = infoById.get().getReceipt().getEnergyFee(); - Long netFee = infoById.get().getReceipt().getNetFee(); - if ("AccountCreateContract".equals(tem.getRawData().getContract(0).getType().toString())) { - logger.info("------account create witnessAdd:" + witnessAdd + " before add:" - + witnessAllowance.getOrDefault(witnessAdd, 0L) + " netfee:" + netFee); - witnessAllowance.put(witnessAdd, witnessAllowance.getOrDefault(witnessAdd, 0L) + netFee); - } else { - if (infoById.get().getReceipt().getResult().toString().contains("OUT_OF_TIME")) { - logger.info("---out of time " + infoById.get().getReceipt().getResult()); - balanceBlackHole += infoById.get().getReceipt().getEnergyFee(); - witnessAllowance.put(witnessAdd, witnessAllowance.getOrDefault(witnessAdd, 0L) - + netFee); - } else { - witnessAllowance.put(witnessAdd, witnessAllowance.getOrDefault(witnessAdd, 0L) - + energyFee + netFee); - } - } + //Long energyFee = infoById.get().getReceipt().getEnergyFee(); + //Long netFee = infoById.get().getReceipt().getNetFee(); + Long fee = infoById.get().getFee(); + witnessAllowance.put(witnessAdd, witnessAllowance.getOrDefault(witnessAdd, 0L) + + fee); } } @@ -7033,7 +7020,6 @@ public static Map getAllowance2(Long startNum, Long endNum, witnessAllowance.put(witnessAdd, pay); logger.info("****** " + witnessAdd + " : " + pay); } - witnessAllowance.put(blackHole, balanceBlackHole); return witnessAllowance; } diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/account/TransactionFee001.java b/framework/src/test/java/stest/tron/wallet/dailybuild/account/TransactionFee001.java index 75286b6b436..e965be88952 100644 --- a/framework/src/test/java/stest/tron/wallet/dailybuild/account/TransactionFee001.java +++ b/framework/src/test/java/stest/tron/wallet/dailybuild/account/TransactionFee001.java @@ -76,7 +76,7 @@ public class TransactionFee001 { Long blackHoleBalance2 = 0L; Long witness01Increase = 0L; Long witness02Increase = 0L; - Long blackHoleIncrease = 0L; + //Long blackHoleIncrease = 0L; String txid = null; @@ -139,10 +139,8 @@ public void test01DeployContractEnergyFeeToSr() { blockingStubFull).getBalance(); witness02Increase = witness02Allowance2 - witness02Allowance1; witness01Increase = witness01Allowance2 - witness01Allowance1; - blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; + //blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; logger.info("----startNum:" + startNum + " endNum:" + endNum); - logger.info("-----black hole 1: " + blackHoleBalance1 + " black hole 2: " + blackHoleBalance2 - + " increase :" + blackHoleIncrease); logger.info("====== witness02Allowance1 :" + witness02Allowance1 + " witness02Allowance2 :" + witness02Allowance2 + "increase :" + witness02Increase); logger.info("====== witness01Allowance1 :" + witness01Allowance1 + " witness01Allowance2 :" @@ -229,10 +227,8 @@ public void test02UpdateAccountPermissionAndMultiSiginTrans() { blockingStubFull).getBalance(); witness02Increase = witness02Allowance2 - witness02Allowance1; witness01Increase = witness01Allowance2 - witness01Allowance1; - blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; + //blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; logger.info("----startNum:" + startNum + " endNum:" + endNum); - logger.info("-----black hole 1: " + blackHoleBalance1 + " black hole 2: " + blackHoleBalance2 - + " increase :" + blackHoleIncrease); logger.info("====== witness02Allowance1 :" + witness02Allowance1 + " witness02Allowance2 :" + witness02Allowance2 + "increase :" + witness02Increase); logger.info("====== witness01Allowance1 :" + witness01Allowance1 + " witness01Allowance2 :" @@ -245,7 +241,7 @@ public void test02UpdateAccountPermissionAndMultiSiginTrans() { - witness01Increase)) <= 2); Assert.assertTrue((Math.abs(witnessAllowance.get(ByteArray.toHexString(witnessAddress02)) - witness02Increase)) <= 2); - Assert.assertEquals(100000000L, blackHoleIncrease.longValue()); + Assert.assertEquals(blackHoleBalance2, blackHoleBalance1); ownerPermissionKeys.clear(); ownerPermissionKeys.add(tmpKey02); @@ -309,10 +305,7 @@ public void test02UpdateAccountPermissionAndMultiSiginTrans() { blockingStubFull).getBalance(); witness02Increase = witness02Allowance2 - witness02Allowance1; witness01Increase = witness01Allowance2 - witness01Allowance1; - blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; logger.info("----startNum:" + startNum + " endNum:" + endNum); - logger.info("-----black hole 1: " + blackHoleBalance1 + " black hole 2: " + blackHoleBalance2 - + " increase :" + blackHoleIncrease); logger.info("====== witness02Allowance1 :" + witness02Allowance1 + " witness02Allowance2 :" + witness02Allowance2 + "increase :" + witness02Increase); logger.info("====== witness01Allowance1 :" + witness01Allowance1 + " witness01Allowance2 :" @@ -324,15 +317,14 @@ public void test02UpdateAccountPermissionAndMultiSiginTrans() { - witness01Increase)) <= 2); Assert.assertTrue((Math.abs(witnessAllowance.get(ByteArray.toHexString(witnessAddress02)) - witness02Increase)) <= 2); - Assert.assertEquals(1000000L, blackHoleIncrease.longValue()); + Assert.assertEquals(blackHoleBalance2, blackHoleBalance1); } @Test(enabled = true, description = "Test trigger result is \"OUT_OF_TIME\"" + " with energy fee to sr") public void test03OutOfTimeEnergyFeeToBlackHole() { Random rand = new Random(); - Integer randNum = rand.nextInt(30) + 1; - randNum = rand.nextInt(4000); + Integer randNum = rand.nextInt(4000); Assert.assertTrue(PublicMethed.sendcoin(deployAddress, maxFeeLimit * 10, fromAddress, testKey002, blockingStubFull)); @@ -372,25 +364,28 @@ public void test03OutOfTimeEnergyFeeToBlackHole() { blockingStubFull).getBalance(); witness02Increase = witness02Allowance2 - witness02Allowance1; witness01Increase = witness01Allowance2 - witness01Allowance1; - blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; logger.info("----startNum:" + startNum + " endNum:" + endNum); - logger.info("-----black hole 1: " + blackHoleBalance1 + " black hole 2: " + blackHoleBalance2 - + " increase :" + blackHoleIncrease); logger.info("====== witness02Allowance1 :" + witness02Allowance1 + " witness02Allowance2 :" + witness02Allowance2 + "increase :" + witness02Increase); logger.info("====== witness01Allowance1 :" + witness01Allowance1 + " witness01Allowance2 :" + witness01Allowance2 + " increase :" + witness01Increase); Optional infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull); + logger.info("InfoById:" + infoById); + Map witnessAllowance = PublicMethed.getAllowance2(startNum, endNum, blockingStubFull); Assert.assertTrue((Math.abs(witnessAllowance.get(ByteArray.toHexString(witnessAddress01)) - witness01Increase)) <= 2); Assert.assertTrue((Math.abs(witnessAllowance.get(ByteArray.toHexString(witnessAddress02)) - witness02Increase)) <= 2); - Assert.assertEquals(witnessAllowance.get(blackHoleAdd), blackHoleIncrease); + Assert.assertEquals(blackHoleBalance2, blackHoleBalance1); + Long punishment = infoById.get().getPunishment(); + logger.info("receipt:" + infoById.get().getReceipt()); + Assert.assertEquals(punishment, maxFeeLimit); + Assert.assertTrue(punishment == infoById.get().getReceipt().getEnergyFee()); } @Test(enabled = true, description = "Test create account with netFee to sr") @@ -423,10 +418,7 @@ public void test04AccountCreate() { witness02Increase = witness02Allowance2 - witness02Allowance1; witness01Increase = witness01Allowance2 - witness01Allowance1; - blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; logger.info("----startNum:" + startNum + " endNum:" + endNum); - logger.info("-----black hole 1: " + blackHoleBalance1 + " black hole 2: " + blackHoleBalance2 - + " increase :" + blackHoleIncrease); logger.info("====== witness02Allowance1 :" + witness02Allowance1 + " witness02Allowance2 :" + witness02Allowance2 + "increase :" + witness02Increase); logger.info("====== witness01Allowance1 :" + witness01Allowance1 + " witness01Allowance2 :" @@ -438,7 +430,7 @@ public void test04AccountCreate() { - witness01Increase)) <= 2); Assert.assertTrue((Math.abs(witnessAllowance.get(ByteArray.toHexString(witnessAddress02)) - witness02Increase)) <= 2); - Assert.assertEquals(witnessAllowance.get(blackHoleAdd), blackHoleIncrease); + Assert.assertEquals(blackHoleBalance1,blackHoleBalance2); } @Test(enabled = true, description = "Test trigger contract with netFee and energyFee to sr") @@ -490,11 +482,8 @@ public void test05NetFeeAndEnergyFee2Sr() { blockingStubFull).getBalance(); witness02Increase = witness02Allowance2 - witness02Allowance1; witness01Increase = witness01Allowance2 - witness01Allowance1; - blackHoleIncrease = blackHoleBalance2 - blackHoleBalance1; logger.info("----startNum:" + startNum + " endNum:" + endNum); - logger.info("-----black hole 1: " + blackHoleBalance1 + " black hole 2: " + blackHoleBalance2 - + " increase :" + blackHoleIncrease); logger.info("====== witness02Allowance1 :" + witness02Allowance1 + " witness02Allowance2 :" + witness02Allowance2 + "increase :" + witness02Increase); logger.info("====== witness01Allowance1 :" + witness01Allowance1 + " witness01Allowance2 :" @@ -508,7 +497,7 @@ public void test05NetFeeAndEnergyFee2Sr() { - witness01Increase)) <= 2); Assert.assertTrue((Math.abs(witnessAllowance.get(ByteArray.toHexString(witnessAddress02)) - witness02Increase)) <= 2); - Assert.assertEquals(witnessAllowance.get(blackHoleAdd), blackHoleIncrease); + Assert.assertEquals(blackHoleBalance1,blackHoleBalance2); } /** * constructor.