Skip to content

Feature/proxy financial/update rbac #253

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
merged 6 commits into from
Nov 9, 2022
Merged

Feature/proxy financial/update rbac #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a09e62
Add unit tests for initial setup, sudo admin registration & users. Fi…
didiermis Nov 8, 2022
b44921c
Update pallet events & pallet errors
didiermis Nov 8, 2022
ace213e
Update pallet constants
didiermis Nov 8, 2022
5d39542
Add validation to ensure only investor role can update or edit their …
didiermis Nov 9, 2022
5b209d0
Add unit tests for administrator registration flow.
didiermis Nov 9, 2022
2c7559e
Fix type. Update internal documentation.
didiermis Nov 9, 2022
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
13 changes: 8 additions & 5 deletions pallets/fund-admin/src/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@ impl<T: Config> Pallet<T> {
},
CUDAction::Delete => {
// Ensure admin cannot delete themselves
ensure!(user.0 != admin, Error::<T>::AdministatorsCannotDeleteThemselves);
ensure!(user.0 != admin, Error::<T>::AdministratorsCannotDeleteThemselves,
);

Self::do_delete_user(
user.0.clone()
Expand Down Expand Up @@ -545,6 +546,8 @@ impl<T: Config> Pallet<T> {
user_info.email = mod_email[0].clone();
}
if let Some(documents) = documents {
// Ensure user is an investor
ensure!(user_info.role == ProxyRole::Investor, Error::<T>::UserIsNotAnInvestor);
user_info.documents = Some(documents);
}
Ok(())
Expand Down Expand Up @@ -972,7 +975,7 @@ impl<T: Config> Pallet<T> {
match drawdown_data.drawdown_type {
DrawdownType::EB5 => {
// Ensure transactions_feedback is some
let mod_transactions_feedback = transactions_feedback.ok_or(Error::<T>::EB5FeebackMissing)?;
let mod_transactions_feedback = transactions_feedback.ok_or(Error::<T>::EB5MissingFeedback)?;

for (transaction_id, field_description) in mod_transactions_feedback {
// Update transaction feedback
Expand Down Expand Up @@ -1259,7 +1262,7 @@ impl<T: Config> Pallet<T> {
Self::is_authorized(admin.clone(), &Self::get_global_scope(), ProxyPermission::Expenditures)?;

// Ensure projects is not empty
ensure!(!projects.is_empty(), Error::<T>::ProjectsIsEmpty);
ensure!(!projects.is_empty(), Error::<T>::InflationRateMissingProjectIds);

// Match each CUD action
for project in projects {
Expand Down Expand Up @@ -1313,7 +1316,7 @@ impl<T: Config> Pallet<T> {

/// Get global scope
pub fn get_global_scope() -> [u8;32] {
let global_scope = <GlobalScope<T>>::try_get().map_err(|_| Error::<T>::NoneValue).unwrap();
let global_scope = <GlobalScope<T>>::try_get().map_err(|_| Error::<T>::NoGlobalScopeValueWasFound).unwrap();
global_scope
}

Expand Down Expand Up @@ -1672,7 +1675,7 @@ impl<T: Config> Pallet<T> {
//Remove user from UsersInfo storage map
<UsersInfo<T>>::remove(admin.clone());

// Remove administrator to rbac pallet
// Remove administrator from rbac pallet
T::Rbac::remove_role_from_user(
admin.clone(),
Self::pallet_id(),
Expand Down
Loading