Skip to content
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

Enable tests from CannotDeleteSystemEntitiesSuite #9440

Merged
merged 3 commits into from
Oct 31, 2023
Merged

Enable tests from CannotDeleteSystemEntitiesSuite #9440

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eb8ea3
fix: enable tests from suite
Ivo-Yankov Oct 24, 2023
b2bc179
chore: spotless
Ivo-Yankov Oct 24, 2023
2027cbd
Merge branch 'develop' into 9439-enable-tests-from-cannotdeletesystem…
Ivo-Yankov Oct 27, 2023
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
105 changes: 90 additions & 15 deletions ...ts/src/main/java/com/hedera/services/bdd/suites/misc/CannotDeleteSystemEntitiesSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@ public boolean canRunConcurrent() {
public List<HapiSpec> getSpecsInSuite() {
return List.of(new HapiSpec[] {
ensureSystemAccountsHaveSomeFunds(),
systemUserCannotDeleteSystemAccounts(1, 100, GENESIS),
systemUserCannotDeleteSystemAccounts(700, 750, GENESIS),
systemUserCannotDeleteSystemAccounts(1, 100, SYSTEM_ADMIN),
systemUserCannotDeleteSystemAccounts(700, 750, SYSTEM_ADMIN),
systemUserCannotDeleteSystemAccounts(1, 100, SYSTEM_DELETE_ADMIN),
systemUserCannotDeleteSystemAccounts(700, 750, SYSTEM_DELETE_ADMIN),
normalUserCannotDeleteSystemAccounts(1, 100),
normalUserCannotDeleteSystemAccounts(700, 750),
systemUserCannotDeleteSystemFiles(sysFileIds, GENESIS),
systemUserCannotDeleteSystemFiles(sysFileIds, SYSTEM_ADMIN),
systemUserCannotDeleteSystemFiles(sysFileIds, SYSTEM_DELETE_ADMIN),
normalUserCannotDeleteSystemFiles(sysFileIds),
systemDeleteCannotDeleteSystemFiles(sysFileIds, GENESIS),
systemDeleteCannotDeleteSystemFiles(sysFileIds, SYSTEM_ADMIN),
systemDeleteCannotDeleteSystemFiles(sysFileIds, SYSTEM_DELETE_ADMIN)
genesisCannotDeleteSystemAccountsFrom1To100(),
genesisCannotDeleteSystemAccountsFrom700To750(),
systemAdminCannotDeleteSystemAccountsFrom1To100(),
systemAdminCannotDeleteSystemAccountsFrom700To750(),
systemDeleteAdminCannotDeleteSystemAccountsFrom1To100(),
systemDeleteAdminCannotDeleteSystemAccountsFrom700To750(),
normalUserCannotDeleteSystemAccountsFrom1To100(),
normalUserCannotDeleteSystemAccountsFrom700To750(),
genesisCannotDeleteSystemFileIds(),
systemAdminCannotDeleteSystemFileIds(),
systemDeleteAdminCannotDeleteSystemFileIds(),
normalUserCannotDeleteSystemFileIds(),
genesisCannotSystemFileDeleteFileIds(),
systemAdminCannotSystemFileDeleteFileIds(),
systemDeleteAdminCannotSystemFileDeleteFileIds()
});
}

Expand All @@ -88,6 +88,81 @@ private HapiSpec ensureSystemAccountsHaveSomeFunds() {
.payingWith(GENESIS));
}

@HapiTest
private HapiSpec genesisCannotDeleteSystemAccountsFrom1To100() {
return systemUserCannotDeleteSystemAccounts(1, 100, GENESIS);
}

@HapiTest
private HapiSpec genesisCannotDeleteSystemAccountsFrom700To750() {
return systemUserCannotDeleteSystemAccounts(700, 750, GENESIS);
}

@HapiTest
private HapiSpec systemAdminCannotDeleteSystemAccountsFrom1To100() {
return systemUserCannotDeleteSystemAccounts(1, 100, SYSTEM_ADMIN);
}

@HapiTest
private HapiSpec systemAdminCannotDeleteSystemAccountsFrom700To750() {
return systemUserCannotDeleteSystemAccounts(700, 750, SYSTEM_ADMIN);
}

@HapiTest
private HapiSpec systemDeleteAdminCannotDeleteSystemAccountsFrom1To100() {
return systemUserCannotDeleteSystemAccounts(1, 100, SYSTEM_DELETE_ADMIN);
}

@HapiTest
private HapiSpec systemDeleteAdminCannotDeleteSystemAccountsFrom700To750() {
return systemUserCannotDeleteSystemAccounts(700, 750, SYSTEM_DELETE_ADMIN);
}

@HapiTest
private HapiSpec normalUserCannotDeleteSystemAccountsFrom1To100() {
return normalUserCannotDeleteSystemAccounts(1, 100);
}

@HapiTest
private HapiSpec normalUserCannotDeleteSystemAccountsFrom700To750() {
return normalUserCannotDeleteSystemAccounts(700, 750);
}

@HapiTest
private HapiSpec genesisCannotDeleteSystemFileIds() {
return systemUserCannotDeleteSystemFiles(sysFileIds, GENESIS);
}

@HapiTest
private HapiSpec systemAdminCannotDeleteSystemFileIds() {
return systemUserCannotDeleteSystemFiles(sysFileIds, SYSTEM_ADMIN);
}

@HapiTest
private HapiSpec systemDeleteAdminCannotDeleteSystemFileIds() {
return systemUserCannotDeleteSystemFiles(sysFileIds, SYSTEM_DELETE_ADMIN);
}

@HapiTest
private HapiSpec normalUserCannotDeleteSystemFileIds() {
return normalUserCannotDeleteSystemFiles(sysFileIds);
}

@HapiTest
private HapiSpec genesisCannotSystemFileDeleteFileIds() {
return systemDeleteCannotDeleteSystemFiles(sysFileIds, GENESIS);
}

@HapiTest
private HapiSpec systemAdminCannotSystemFileDeleteFileIds() {
return systemDeleteCannotDeleteSystemFiles(sysFileIds, SYSTEM_ADMIN);
}

@HapiTest
private HapiSpec systemDeleteAdminCannotSystemFileDeleteFileIds() {
return systemDeleteCannotDeleteSystemFiles(sysFileIds, SYSTEM_DELETE_ADMIN);
}

private HapiSpec systemUserCannotDeleteSystemAccounts(int firstAccount, int lastAccount, String sysUser) {
return defaultHapiSpec("systemUserCannotDeleteSystemAccounts")
.given(cryptoCreate("unluckyReceiver").balance(0L))
Expand Down
Loading