Skip to content

feat(vm): optimize tests and logs #6190

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
CodeNinjaEvan merged 4 commits into from
Feb 15, 2025
Merged

feat(vm): optimize tests and logs #6190

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
8b7ca9f
chore(vm): adjust inappropriate log content
yanghang8612 Jul 4, 2024
2a3d5ca
impr(test): optimize some unit tests
yanghang8612 Jul 4, 2024
7f0b184
impr(test): revert changes and optimize those tests in a safer way
yanghang8612 Jan 7, 2025
9a44b0b
Merge branch 'release_v4.8.0' into feat/optimize_tests_and_logs
yanghang8612 Feb 15, 2025
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
2 changes: 1 addition & 1 deletion actuator/src/main/java/org/tron/core/vm/nativecontract/UnfreezeBalanceV2Processor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void validate(UnfreezeBalanceV2Param param, Repository repo)

if (!checkUnfreezeBalance(accountCapsule, param.getUnfreezeBalance(), param.getResourceType())) {
throw new ContractValidateException(
"Invalid unfreeze_balance, [" + param.getUnfreezeBalance() + "] is error");
"Invalid unfreeze_balance, [" + param.getUnfreezeBalance() + "] is too large");
}
}

Expand Down
4 changes: 2 additions & 2 deletions framework/src/test/java/org/tron/common/runtime/vm/BatchValidateSignContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public void staticCallTest() {

@Test
public void correctionTest() {
contract.setConstantCall(false);
List<Object> signatures = new ArrayList<>();
List<Object> addresses = new ArrayList<>();
byte[] hash = Hash.sha3(longData);
Expand Down Expand Up @@ -128,7 +127,8 @@ Pair<Boolean, byte[]> validateMultiSign(byte[] hash, List<Object> signatures,
List<Object> parameters = Arrays.asList("0x" + Hex.toHexString(hash), signatures, addresses);
byte[] input = Hex.decode(AbiUtil.parseParameters(METHOD_SIGN, parameters));
contract.getEnergyForData(input);
contract.setVmShouldEndInUs(System.nanoTime() / 1000 + 500 * 1000);
long maxExecutionTime = 2000; // ms
contract.setVmShouldEndInUs(System.nanoTime() / 1000 + maxExecutionTime * 1000);
Pair<Boolean, byte[]> ret = contract.execute(input);
logger.info("BytesArray:{}，HexString:{}", Arrays.toString(ret.getValue()),
Hex.toHexString(ret.getValue()));
Expand Down
7 changes: 7 additions & 0 deletions framework/src/test/java/org/tron/common/runtime/vm/Create2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,16 @@ public void testCreate2()
// Trigger contract method: deploy(bytes,uint)
long salt = 100L;
String hexInput = AbiUtil.parseMethod(methodSign, Arrays.asList(testCode, salt));

long preTime = manager.getDynamicPropertiesStore().getMaxCpuTimeOfOneTx();
// set max cpu time to 500
manager.getDynamicPropertiesStore().saveMaxCpuTimeOfOneTx(500L);
TVMTestResult result = TvmTestUtils
.triggerContractAndReturnTvmTestResult(Hex.decode(OWNER_ADDRESS),
factoryAddress, Hex.decode(hexInput), 0, fee, manager, null);
// restore max cpu time
manager.getDynamicPropertiesStore().saveMaxCpuTimeOfOneTx(preTime);

Assert.assertNull(result.getRuntime().getRuntimeError());

byte[] returnValue = result.getRuntime().getResult().getHReturn();
Expand Down