Skip to content

chore: fix pr 596 #645

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
p3ris0n merged 3 commits into from
Aug 4, 2026
Merged

chore: fix pr 596 #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a580b12
chore: fix pr 596
p3ris0n Aug 4, 2026
bce8db7
chore: fix cargo fmt
p3ris0n Aug 4, 2026
df2f062
chore: fix linter errors
p3ris0n Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 18 additions & 3 deletions contracts/admin/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ pub fn mark_executed(env: &Env, proposal_id: u64) {

#[cfg(test)]
mod tests {
use super::*;
use soroban_sdk::testutils::Address as _;
use soroban_sdk::testutils::Events as _;
use soroban_sdk::testutils::Ledger;
Expand Down Expand Up @@ -1079,6 +1080,23 @@ mod tests {

#[test]
fn test_non_privileged_caller_cannot_grant_pauser() {
let env = Env::default();
env.mock_all_auths();
let contract_id = env.register(AdminContract, ());
let client = AdminContractClient::new(&env, &contract_id);
let admin = Address::generate(&env);
let caller = Address::generate(&env);
let target = Address::generate(&env);

client.set_admin(&admin);

// caller has no role — should be rejected
let result = client.try_grant_role(&caller, &Role::Pauser, &target);
assert_eq!(result, Err(Ok(soroban_sdk::Error::from_contract_error(3))));
assert!(!client.has_role(&Role::Pauser, &target));
}

#[test]
fn test_super_admin_can_grant_super_admin() {
let env = Env::default();
env.mock_all_auths();
Expand Down Expand Up @@ -2707,6 +2725,3 @@ mod tests {
assert!(result.is_err());
}
}

#[cfg(test)]
mod proptest;
75 changes: 0 additions & 75 deletions contracts/admin/src/proptest.rs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.100.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -287,7 +288,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Pauser"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -288,7 +287,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Admin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -288,7 +287,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -287,7 +288,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -287,7 +288,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.21.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -288,7 +287,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Admin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.23.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -288,7 +287,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -288,7 +287,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.25.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.26.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -287,7 +288,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.28.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -288,7 +287,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.29.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.30.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Pauser"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.31.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -288,7 +287,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
Loading
Loading