From 663acc88ddd2e623ec2fe3f9267149648b419e22 Mon Sep 17 00:00:00 2001 From: Asuka Date: Mon, 2 Aug 2021 17:52:38 +0800 Subject: [PATCH] code: fix sonar check --- .../org/tron/core/utils/ProposalUtil.java | 4 +- .../java/org/tron/core/vm/EnergyCost.java | 198 +++--------------- .../src/main/java/org/tron/core/vm/VM.java | 72 +++---- .../org/tron/core/vm/program/Program.java | 28 ++- .../tron/common/runtime/vm/FreezeTest.java | 4 +- .../runtime/vm/TransferToAccountTest.java | 4 +- .../transferfailed/TransferFailed001.java | 4 +- .../transferfailed/TransferFailed002.java | 4 +- .../transferfailed/TransferFailed003.java | 4 +- 9 files changed, 102 insertions(+), 220 deletions(-) diff --git a/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java b/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java index 277bf2f6957..a8e59966e81 100644 --- a/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java +++ b/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java @@ -484,9 +484,9 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore, if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_3)) { throw new ContractValidateException("Bad chain parameter id [TOTAL_NET_LIMIT]"); } - if (value < 0 || value > 1000_000_000_000L) { + if (value < 0 || value > 1_000_000_000_000L) { throw new ContractValidateException( - "Bad chain parameter value, valid range is [0, 1000_000_000_000L]"); + "Bad chain parameter value, valid range is [0, 1_000_000_000_000L]"); } break; } diff --git a/actuator/src/main/java/org/tron/core/vm/EnergyCost.java b/actuator/src/main/java/org/tron/core/vm/EnergyCost.java index 942478ca3d3..fda84df5b71 100644 --- a/actuator/src/main/java/org/tron/core/vm/EnergyCost.java +++ b/actuator/src/main/java/org/tron/core/vm/EnergyCost.java @@ -4,19 +4,6 @@ public class EnergyCost { private static EnergyCost instance = null; - /* backwards compatibility, remove eventually */ - private final int STEP = 1; - /* backwards compatibility, remove eventually */ - private final int SSTORE = 300; - private final int ZEROSTEP = 0; - private final int QUICKSTEP = 2; - private final int FASTESTSTEP = 3; - private final int FASTSTEP = 5; - private final int MIDSTEP = 8; - private final int SLOWSTEP = 10; - private final int EXTSTEP = 20; - private final int GENESISENERGYLIMIT = 1000000; - private final int MINENERGYLIMIT = 125000; private final int BALANCE = 20; private final int SHA3 = 30; private final int SHA3_WORD = 6; @@ -28,33 +15,18 @@ public class EnergyCost { private final int RESET_SSTORE = 5000; private final int REFUND_SSTORE = 15000; private final int CREATE = 32000; - private final int JUMPDEST = 1; - private final int CREATE_DATA_BYTE = 5; private final int CALL = 40; private final int STIPEND_CALL = 2300; - private final int VT_CALL = 9000; //value transfer call - private final int NEW_ACCT_CALL = 25000; //new account call + private final int VT_CALL = 9000; // value transfer call + private final int NEW_ACCT_CALL = 25000; // new account call private final int MEMORY = 3; - private final int SUICIDE_REFUND = 24000; - private final int QUAD_COEFF_DIV = 512; private final int CREATE_DATA = 200; - private final int TX_NO_ZERO_DATA = 68; - private final int TX_ZERO_DATA = 4; - private final int TRANSACTION = 21000; - private final int TRANSACTION_CREATE_CONTRACT = 53000; private final int LOG_ENERGY = 375; private final int LOG_DATA_ENERGY = 8; private final int LOG_TOPIC_ENERGY = 375; private final int COPY_ENERGY = 3; private final int EXP_ENERGY = 10; private final int EXP_BYTE_ENERGY = 10; - private final int IDENTITY = 15; - private final int IDENTITY_WORD = 3; - private final int RIPEMD160 = 600; - private final int RIPEMD160_WORD = 120; - private final int SHA256 = 60; - private final int SHA256_WORD = 12; - private final int EC_RECOVER = 3000; private final int EXT_CODE_SIZE = 20; private final int EXT_CODE_COPY = 20; private final int EXT_CODE_HASH = 400; @@ -73,235 +45,131 @@ public static EnergyCost getInstance() { return instance; } - public int getSTEP() { - return STEP; - } - - public int getSSTORE() { - return SSTORE; - } - - public int getZEROSTEP() { - return ZEROSTEP; - } - - public int getQUICKSTEP() { - return QUICKSTEP; - } - - public int getFASTESTSTEP() { - return FASTESTSTEP; - } - - public int getFASTSTEP() { - return FASTSTEP; - } - - public int getMIDSTEP() { - return MIDSTEP; - } - - public int getSLOWSTEP() { - return SLOWSTEP; - } - - public int getEXTSTEP() { - return EXTSTEP; - } - - public int getGENESISENERGYLIMIT() { - return GENESISENERGYLIMIT; - } - - public int getMINENERGYLIMIT() { - return MINENERGYLIMIT; - } - - public int getBALANCE() { + public int getBalance() { return BALANCE; } - public int getSHA3() { + public int getSha3() { return SHA3; } - public int getSHA3_WORD() { + public int getSha3Word() { return SHA3_WORD; } - public int getSLOAD() { + public int getSLoad() { return SLOAD; } - public int getSTOP() { + public int getStop() { return STOP; } - public int getSUICIDE() { + public int getSuicide() { return SUICIDE; } - public int getCLEAR_SSTORE() { + public int getClearSStore() { return CLEAR_SSTORE; } - public int getSET_SSTORE() { + public int getSetSStore() { return SET_SSTORE; } - public int getRESET_SSTORE() { + public int getResetSStore() { return RESET_SSTORE; } - public int getREFUND_SSTORE() { + public int getRefundSStore() { return REFUND_SSTORE; } - public int getCREATE() { + public int getCreate() { return CREATE; } - public int getJUMPDEST() { - return JUMPDEST; - } - - public int getCREATE_DATA_BYTE() { - return CREATE_DATA_BYTE; - } - - public int getCALL() { + public int getCall() { return CALL; } - public int getSTIPEND_CALL() { + public int getStipendCall() { return STIPEND_CALL; } - public int getVT_CALL() { + public int getVtCall() { return VT_CALL; } - public int getNEW_ACCT_CALL() { + public int getNewAcctCall() { return NEW_ACCT_CALL; } - public int getNEW_ACCT_SUICIDE() { + public int getNewAcctSuicide() { return NEW_ACCT_SUICIDE; } - public int getMEMORY() { + public int getMemory() { return MEMORY; } - public int getSUICIDE_REFUND() { - return SUICIDE_REFUND; - } - - public int getQUAD_COEFF_DIV() { - return QUAD_COEFF_DIV; - } - public int getCREATE_DATA() { return CREATE_DATA; } - public int getTX_NO_ZERO_DATA() { - return TX_NO_ZERO_DATA; - } - - public int getTX_ZERO_DATA() { - return TX_ZERO_DATA; - } - - public int getTRANSACTION() { - return TRANSACTION; - } - - public int getTRANSACTION_CREATE_CONTRACT() { - return TRANSACTION_CREATE_CONTRACT; - } - - public int getLOG_ENERGY() { + public int getLogEnergy() { return LOG_ENERGY; } - public int getLOG_DATA_ENERGY() { + public int getLogDataEnergy() { return LOG_DATA_ENERGY; } - public int getLOG_TOPIC_ENERGY() { + public int getLogTopicEnergy() { return LOG_TOPIC_ENERGY; } - public int getCOPY_ENERGY() { + public int getCopyEnergy() { return COPY_ENERGY; } - public int getEXP_ENERGY() { + public int getExpEnergy() { return EXP_ENERGY; } - public int getEXP_BYTE_ENERGY() { + public int getExpByteEnergy() { return EXP_BYTE_ENERGY; } - public int getIDENTITY() { - return IDENTITY; - } - - public int getIDENTITY_WORD() { - return IDENTITY_WORD; - } - - public int getRIPEMD160() { - return RIPEMD160; - } - - public int getRIPEMD160_WORD() { - return RIPEMD160_WORD; - } - - public int getSHA256() { - return SHA256; - } - - public int getSHA256_WORD() { - return SHA256_WORD; - } - - public int getEC_RECOVER() { - return EC_RECOVER; - } - - public int getEXT_CODE_SIZE() { + public int getExtCodeSize() { return EXT_CODE_SIZE; } - public int getEXT_CODE_COPY() { + public int getExtCodeCopy() { return EXT_CODE_COPY; } - public int getEXT_CODE_HASH() { + public int getExtCodeHash() { return EXT_CODE_HASH; } - public int getFREEZE() { + public int getFreeze() { return FREEZE; } - public int getUNFREEZE() { + public int getUnfreeze() { return UNFREEZE; } - public int getFREEZE_EXPIRE_TIME() { + public int getFreezeExpireTime() { return FREEZE_EXPIRE_TIME; } - public int getVOTE_WITNESS() { + public int getVoteWitness() { return VOTE_WITNESS; } - public int getWITHDRAW_REWARD() { + public int getWithdrawReward() { return WITHDRAW_REWARD; } } diff --git a/actuator/src/main/java/org/tron/core/vm/VM.java b/actuator/src/main/java/org/tron/core/vm/VM.java index ae39a870b35..4df2b97d3d1 100644 --- a/actuator/src/main/java/org/tron/core/vm/VM.java +++ b/actuator/src/main/java/org/tron/core/vm/VM.java @@ -85,13 +85,13 @@ private long calcMemEnergy(EnergyCost energyCosts, long oldMemSize, BigInteger n long memWords = (memoryUsage / 32); long memWordsOld = (oldMemSize / 32); //TODO #POC9 c_quadCoeffDiv = 512, this should be a constant, not magic number - long memEnergy = (energyCosts.getMEMORY() * memWords + memWords * memWords / 512) - - (energyCosts.getMEMORY() * memWordsOld + memWordsOld * memWordsOld / 512); + long memEnergy = (energyCosts.getMemory() * memWords + memWords * memWords / 512) + - (energyCosts.getMemory() * memWordsOld + memWordsOld * memWordsOld / 512); energyCost += memEnergy; } if (copySize > 0) { - long copyEnergy = energyCosts.getCOPY_ENERGY() * ((copySize + 31) / 32); + long copyEnergy = energyCosts.getCopyEnergy() * ((copySize + 31) / 32); energyCost += copyEnergy; } return energyCost; @@ -137,14 +137,14 @@ public void step(Program program) { // Calculate fees and spend energy switch (op) { case STOP: - energyCost = energyCosts.getSTOP(); + energyCost = energyCosts.getStop(); break; case SUICIDE: - energyCost = energyCosts.getSUICIDE(); + energyCost = energyCosts.getSuicide(); DataWord suicideAddressWord = stack.get(stack.size() - 1); if (isDeadAccount(program, suicideAddressWord) && !program.getBalance(program.getContractAddress()).isZero()) { - energyCost += energyCosts.getNEW_ACCT_SUICIDE(); + energyCost += energyCosts.getNewAcctSuicide(); } break; case SSTORE: @@ -153,41 +153,41 @@ public void step(Program program) { DataWord oldValue = program.storageLoad(stack.peek()); if (oldValue == null && !newValue.isZero()) { // set a new not-zero value - energyCost = energyCosts.getSET_SSTORE(); + energyCost = energyCosts.getSetSStore(); } else if (oldValue != null && newValue.isZero()) { // set zero to an old value - program.futureRefundEnergy(energyCosts.getREFUND_SSTORE()); - energyCost = energyCosts.getCLEAR_SSTORE(); + program.futureRefundEnergy(energyCosts.getRefundSStore()); + energyCost = energyCosts.getClearSStore(); } else { // include: // [1] oldValue == null && newValue == 0 // [2] oldValue != null && newValue != 0 - energyCost = energyCosts.getRESET_SSTORE(); + energyCost = energyCosts.getResetSStore(); } break; case SLOAD: - energyCost = energyCosts.getSLOAD(); + energyCost = energyCosts.getSLoad(); break; case TOKENBALANCE: case BALANCE: case ISCONTRACT: - energyCost = energyCosts.getBALANCE(); + energyCost = energyCosts.getBalance(); break; case FREEZE: - energyCost = energyCosts.getFREEZE(); + energyCost = energyCosts.getFreeze(); DataWord receiverAddressWord = stack.get(stack.size() - 3); if (isDeadAccount(program, receiverAddressWord)) { - energyCost += energyCosts.getNEW_ACCT_CALL(); + energyCost += energyCosts.getNewAcctCall(); } break; case UNFREEZE: - energyCost = energyCosts.getUNFREEZE(); + energyCost = energyCosts.getUnfreeze(); break; case FREEZEEXPIRETIME: - energyCost = energyCosts.getFREEZE_EXPIRE_TIME(); + energyCost = energyCosts.getFreezeExpireTime(); break; case VOTEWITNESS: - energyCost = energyCosts.getVOTE_WITNESS(); + energyCost = energyCosts.getVoteWitness(); DataWord amountArrayLength = stack.get(stack.size() - 1).clone(); DataWord amountArrayOffset = stack.get(stack.size() - 2); DataWord witnessArrayLength = stack.get(stack.size() - 3).clone(); @@ -206,7 +206,7 @@ public void step(Program program) { amountArrayMemoryNeeded : witnessArrayMemoryNeeded), 0, op); break; case WITHDRAWREWARD: - energyCost = energyCosts.getWITHDRAW_REWARD(); + energyCost = energyCosts.getWithdrawReward(); break; // These all operate on memory and therefore potentially expand it: @@ -227,15 +227,15 @@ public void step(Program program) { break; case RETURN: case REVERT: - energyCost = energyCosts.getSTOP() + calcMemEnergy(energyCosts, oldMemSize, + energyCost = energyCosts.getStop() + calcMemEnergy(energyCosts, oldMemSize, memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0, op); break; case SHA3: - energyCost = energyCosts.getSHA3() + calcMemEnergy(energyCosts, oldMemSize, + energyCost = energyCosts.getSha3() + calcMemEnergy(energyCosts, oldMemSize, memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0, op); DataWord size = stack.get(stack.size() - 2); long chunkUsed = (size.longValueSafe() + 31) / 32; - energyCost += chunkUsed * energyCosts.getSHA3_WORD(); + energyCost += chunkUsed * energyCosts.getSha3Word(); break; case CALLDATACOPY: case RETURNDATACOPY: @@ -249,15 +249,15 @@ public void step(Program program) { stack.get(stack.size() - 3).longValueSafe(), op); break; case EXTCODESIZE: - energyCost = energyCosts.getEXT_CODE_SIZE(); + energyCost = energyCosts.getExtCodeSize(); break; case EXTCODECOPY: - energyCost = energyCosts.getEXT_CODE_COPY() + calcMemEnergy(energyCosts, oldMemSize, + energyCost = energyCosts.getExtCodeCopy() + calcMemEnergy(energyCosts, oldMemSize, memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 4)), stack.get(stack.size() - 4).longValueSafe(), op); break; case EXTCODEHASH: - energyCost = energyCosts.getEXT_CODE_HASH(); + energyCost = energyCosts.getExtCodeHash(); break; case CALL: case CALLCODE: @@ -265,7 +265,7 @@ public void step(Program program) { case STATICCALL: case CALLTOKEN: // here, contract call an other contract, or a library, and so on - energyCost = energyCosts.getCALL(); + energyCost = energyCosts.getCall(); DataWord callEnergyWord = stack.get(stack.size() - 1); DataWord callAddressWord = stack.get(stack.size() - 2); DataWord value = op.callHasValue() ? stack.get(stack.size() - 3) : DataWord.ZERO; @@ -274,12 +274,12 @@ public void step(Program program) { if ((op == CALL || op == CALLTOKEN) && isDeadAccount(program, callAddressWord) && !value.isZero()) { - energyCost += energyCosts.getNEW_ACCT_CALL(); + energyCost += energyCosts.getNewAcctCall(); } // TODO #POC9 Make sure this is converted to BigInteger (256num support) if (!value.isZero()) { - energyCost += energyCosts.getVT_CALL(); + energyCost += energyCosts.getVtCall(); } int opOff = op.callHasValue() ? 4 : 3; @@ -306,15 +306,15 @@ && isDeadAccount(program, callAddressWord) energyCost += adjustedCallEnergy.longValueSafe(); break; case CREATE: - energyCost = energyCosts.getCREATE() + calcMemEnergy(energyCosts, oldMemSize, + energyCost = energyCosts.getCreate() + calcMemEnergy(energyCosts, oldMemSize, memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 3)), 0, op); break; case CREATE2: DataWord codeSize = stack.get(stack.size() - 3); - energyCost = energyCosts.getCREATE(); + energyCost = energyCosts.getCreate(); energyCost += calcMemEnergy(energyCosts, oldMemSize, memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 3)), 0, op); - energyCost += DataWord.sizeInWords(codeSize.intValueSafe()) * energyCosts.getSHA3_WORD(); + energyCost += DataWord.sizeInWords(codeSize.intValueSafe()) * energyCosts.getSha3Word(); break; case LOG0: @@ -325,16 +325,16 @@ && isDeadAccount(program, callAddressWord) int nTopics = op.val() - OpCode.LOG0.val(); BigInteger dataSize = stack.get(stack.size() - 2).value(); BigInteger dataCost = dataSize - .multiply(BigInteger.valueOf(energyCosts.getLOG_DATA_ENERGY())); + .multiply(BigInteger.valueOf(energyCosts.getLogDataEnergy())); if (program.getEnergyLimitLeft().value().compareTo(dataCost) < 0) { throw new OutOfEnergyException( "Not enough energy for '%s' operation executing: opEnergy[%d], programEnergy[%d]", op.name(), dataCost.longValueExact(), program.getEnergyLimitLeft().longValueSafe()); } - energyCost = energyCosts.getLOG_ENERGY() - + energyCosts.getLOG_TOPIC_ENERGY() * nTopics - + energyCosts.getLOG_DATA_ENERGY() * stack.get(stack.size() - 2).longValue() + energyCost = energyCosts.getLogEnergy() + + energyCosts.getLogTopicEnergy() * nTopics + + energyCosts.getLogDataEnergy() * stack.get(stack.size() - 2).longValue() + calcMemEnergy(energyCosts, oldMemSize, memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0, op); @@ -345,7 +345,7 @@ && isDeadAccount(program, callAddressWord) DataWord exp = stack.get(stack.size() - 2); int bytesOccupied = exp.bytesOccupied(); energyCost = - (long) energyCosts.getEXP_ENERGY() + energyCosts.getEXP_BYTE_ENERGY() * bytesOccupied; + (long) energyCosts.getExpEnergy() + energyCosts.getExpByteEnergy() * bytesOccupied; break; default: break; @@ -1115,7 +1115,7 @@ && isDeadAccount(program, callAddressWord) } if (!value.isZero()) { - adjustedCallEnergy.add(new DataWord(energyCosts.getSTIPEND_CALL())); + adjustedCallEnergy.add(new DataWord(energyCosts.getStipendCall())); } DataWord tokenId = new DataWord(0); diff --git a/actuator/src/main/java/org/tron/core/vm/program/Program.java b/actuator/src/main/java/org/tron/core/vm/program/Program.java index 647a9c2bd30..fd89c55bcb7 100644 --- a/actuator/src/main/java/org/tron/core/vm/program/Program.java +++ b/actuator/src/main/java/org/tron/core/vm/program/Program.java @@ -1765,7 +1765,9 @@ public boolean freeze(DataWord receiverAddress, DataWord frozenBalance, DataWord } catch (ArithmeticException e) { logger.error("TVM Freeze: frozenBalance out of long range."); } - internalTx.reject(); + if (internalTx != null) { + internalTx.reject(); + } return false; } @@ -1787,12 +1789,16 @@ public boolean unfreeze(DataWord receiverAddress, DataWord resourceType) { processor.validate(param, repository); long unfreezeBalance = processor.execute(param, repository); repository.commit(); - internalTx.setValue(unfreezeBalance); + if (internalTx != null) { + internalTx.setValue(unfreezeBalance); + } return true; } catch (ContractValidateException e) { logger.error("TVM Unfreeze: validate failure. Reason: {}", e.getMessage()); } - internalTx.reject(); + if (internalTx != null) { + internalTx.reject(); + } return false; } @@ -1891,7 +1897,9 @@ public boolean voteWitness(int witnessArrayOffset, int witnessArrayLength, param.addVote(TransactionTrace.convertToTronAddress(witness.getLast20Bytes()), amount.sValue().longValueExact()); } - internalTx.setExtra(param.toJsonStr()); + if (internalTx != null) { + internalTx.setExtra(param.toJsonStr()); + } VoteWitnessProcessor processor = new VoteWitnessProcessor(); processor.validate(param, repository); @@ -1905,7 +1913,9 @@ public boolean voteWitness(int witnessArrayOffset, int witnessArrayLength, } catch (ArithmeticException e) { logger.error("TVM VoteWitness: int or long out of range. caused by: {}", e.getMessage()); } - internalTx.reject(); + if (internalTx != null) { + internalTx.reject(); + } return false; } @@ -1925,14 +1935,18 @@ public long withdrawReward() { processor.validate(param, repository); long allowance = processor.execute(param, repository); repository.commit(); - internalTx.setValue(allowance); + if (internalTx != null) { + internalTx.setValue(allowance); + } return allowance; } catch (ContractValidateException e) { logger.error("TVM WithdrawReward: validate failure. Reason: {}", e.getMessage()); } catch (ContractExeException e) { logger.error("TVM WithdrawReward: execute failure. Reason: {}", e.getMessage()); } - internalTx.reject(); + if (internalTx != null) { + internalTx.reject(); + } return 0; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java b/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java index f8df3e5b86c..a2f8790a8ba 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java @@ -334,7 +334,7 @@ public void testFreezeAndUnfreeze() throws Exception { long energyWithoutCreatingAccountA = freezeForOther(contract, userA, frozenBalance, 0) .getReceipt().getEnergyUsageTotal(); - Assert.assertEquals(energyWithCreatingAccountA - EnergyCost.getInstance().getNEW_ACCT_CALL(), + Assert.assertEquals(energyWithCreatingAccountA - EnergyCost.getInstance().getNewAcctCall(), energyWithoutCreatingAccountA); freezeForOther(contract, userA, frozenBalance, 1); @@ -344,7 +344,7 @@ public void testFreezeAndUnfreeze() throws Exception { long energyWithoutCreatingAccountB = freezeForOther(contract, userB, frozenBalance, 1) .getReceipt().getEnergyUsageTotal(); - Assert.assertEquals(energyWithCreatingAccountB - EnergyCost.getInstance().getNEW_ACCT_CALL(), + Assert.assertEquals(energyWithCreatingAccountB - EnergyCost.getInstance().getNewAcctCall(), energyWithoutCreatingAccountB); freezeForOther(contract, userB, frozenBalance, 0); diff --git a/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java b/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java index 13a5694f830..4e6b5299cb3 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java @@ -198,7 +198,7 @@ public void TransferTokenTest() long energyCostWhenNonExist = runtime.getResult().getEnergyUsed(); //4.Test Energy Assert.assertEquals(energyCostWhenNonExist - energyCostWhenExist, - EnergyCost.getInstance().getNEW_ACCT_CALL()); + EnergyCost.getInstance().getNewAcctCall()); //5. Test transfer Trx with exsit account selectorStr = "transferTo(address,uint256)"; @@ -233,7 +233,7 @@ public void TransferTokenTest() //7.test energy Assert.assertEquals(energyCostWhenNonExist - energyCostWhenExist, - EnergyCost.getInstance().getNEW_ACCT_CALL()); + EnergyCost.getInstance().getNewAcctCall()); //8.test transfer to itself selectorStr = "transferTo(address,uint256)"; diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed001.java b/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed001.java index 279db1d01d0..3587ea7396d 100644 --- a/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed001.java +++ b/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed001.java @@ -325,7 +325,7 @@ public void test003TransferTrxNonexistentTarget() { Assert.assertEquals(2, nonexistentAddressAccount.getBalance()); Assert.assertEquals(0, infoById.get().getResultValue()); - Assert.assertEquals(energyUsageTotal2 + EnergyCost.getInstance().getNEW_ACCT_CALL(), + Assert.assertEquals(energyUsageTotal2 + EnergyCost.getInstance().getNewAcctCall(), energyUsageTotal); } @@ -899,7 +899,7 @@ public void test010TransferRevert() { Assert.assertTrue(beforeEnergyUsed + energyUsed >= afterEnergyUsed); Assert.assertTrue(beforeFreeNetUsed + netUsed >= afterFreeNetUsed); Assert.assertTrue(beforeNetUsed + netUsed >= afterNetUsed); - Assert.assertTrue(energyUsageTotal > EnergyCost.getInstance().getNEW_ACCT_CALL()); + Assert.assertTrue(energyUsageTotal > EnergyCost.getInstance().getNewAcctCall()); } /** diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed002.java b/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed002.java index d9d5561c78f..e175251934d 100644 --- a/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed002.java +++ b/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed002.java @@ -303,7 +303,7 @@ public void test3SendTrxNonexistentTarget() { Assert.assertEquals(0, infoById.get().getResultValue()); Assert.assertNotEquals(energyUsageTotal2, - energyUsageTotal + EnergyCost.getInstance().getNEW_ACCT_CALL()); + energyUsageTotal + EnergyCost.getInstance().getNewAcctCall()); nonexistentAddressAccount = PublicMethed.queryAccount(nonexistentAddress, blockingStubFull1); Assert.assertEquals(2, nonexistentAddressAccount.getBalance()); @@ -559,7 +559,7 @@ public void test7SendTrxNonexistentTargetRevert() { Assert.assertTrue(beforeEnergyUsed + energyUsed >= afterEnergyUsed); Assert.assertTrue(beforeFreeNetUsed + netUsed >= afterFreeNetUsed); Assert.assertTrue(beforeNetUsed + netUsed >= afterNetUsed); - Assert.assertTrue(energyUsageTotal > EnergyCost.getInstance().getNEW_ACCT_CALL()); + Assert.assertTrue(energyUsageTotal > EnergyCost.getInstance().getNewAcctCall()); } diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed003.java b/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed003.java index a47419bc1b3..4b934acede0 100644 --- a/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed003.java +++ b/framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/transferfailed/TransferFailed003.java @@ -390,7 +390,7 @@ public void test3TransferTokenNonexistentTarget() { Assert.assertEquals(contractAccountCountBefore - 2, contractAccountCountAfter.longValue()); Assert.assertEquals(energyUsageTotal, - energyUsageTotal2 + EnergyCost.getInstance().getNEW_ACCT_CALL()); + energyUsageTotal2 + EnergyCost.getInstance().getNewAcctCall()); nonexistentAddressAccount = PublicMethed .getAssetIssueValue(nonexistentAddress, assetAccountId, blockingStubFull1); @@ -792,7 +792,7 @@ public void test9TransferTokenNonexistentTargetRevert() { Assert.assertTrue(beforeEnergyUsed + energyUsed >= afterEnergyUsed); Assert.assertTrue(beforeFreeNetUsed + netUsed >= afterFreeNetUsed); Assert.assertTrue(beforeNetUsed + netUsed >= afterNetUsed); - Assert.assertTrue(energyUsageTotal > EnergyCost.getInstance().getNEW_ACCT_CALL()); + Assert.assertTrue(energyUsageTotal > EnergyCost.getInstance().getNewAcctCall()); Long nonexistentAddressAccount = PublicMethed .getAssetIssueValue(nonexistentAddress, assetAccountId, blockingStubFull1);