Skip to content

Commit 7a17664

Browse files
didiermisdidiermis
committed
Update proxy role name
1 parent 4f1ea18 commit 7a17664

File tree

5 files changed

+31
-45
lines changed

5 files changed

+31
-45
lines changed

‎pallets/proxy-financial/src/functions.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ impl<T: Config> Pallet<T> {
2424
let administrator_role_id = T::Rbac::create_and_set_roles(pallet_id.clone(), [ProxyRole::Administrator.to_vec()].to_vec())?;
2525
T::Rbac::create_and_set_permissions(pallet_id.clone(), administrator_role_id[0], ProxyPermission::administrator_permissions())?;
2626

27-
//Developer rol & permissions
28-
let builder_role_id = T::Rbac::create_and_set_roles(pallet_id.clone(), [ProxyRole::Developer.to_vec()].to_vec())?;
27+
//Builder rol & permissions
28+
let builder_role_id = T::Rbac::create_and_set_roles(pallet_id.clone(), [ProxyRole::Builder.to_vec()].to_vec())?;
2929
T::Rbac::create_and_set_permissions(pallet_id.clone(), builder_role_id[0], ProxyPermission::builder_permissions())?;
3030

3131
// Investor rol & permissions
@@ -132,7 +132,7 @@ impl<T: Config> Pallet<T> {
132132

133133
//Create project data
134134
let project_data = ProjectData::<T> {
135-
developer: Some(BoundedVec::<T::AccountId, T::MaxDevelopersPerProject>::default()),
135+
builder: Some(BoundedVec::<T::AccountId, T::MaxBuildersPerProject>::default()),
136136
investor: Some(BoundedVec::<T::AccountId, T::MaxInvestorsPerProject>::default()),
137137
issuer: Some(BoundedVec::<T::AccountId, T::MaxIssuersPerProject>::default()),
138138
regional_center: Some(BoundedVec::<T::AccountId, T::MaxRegionalCenterPerProject>::default()),
@@ -1374,21 +1374,21 @@ impl<T: Config> Pallet<T> {
13741374
ProxyRole::Administrator => {
13751375
return Err(Error::<T>::CannotRegisterAdminRole.into());
13761376
},
1377-
ProxyRole::Developer => {
1377+
ProxyRole::Builder => {
13781378
//TODO: Fix internal validations
13791379
//TODO: move logic to a helper function to avoid boilerplate
13801380

13811381
//Mutate project data
13821382
<ProjectsInfo<T>>::try_mutate::<_,_,DispatchError,_>(project_id, |project| {
13831383
let project = project.as_mut().ok_or(Error::<T>::ProjectNotFound)?;
1384-
match project.developer.as_mut() {
1385-
Some(developer) => {
1386-
//developer.iter().find(|&u| *u != user).ok_or(Error::<T>::UserAlreadyAssignedToProject)?;
1387-
developer.try_push(user.clone()).map_err(|_| Error::<T>::MaxDevelopersPerProjectReached)?;
1384+
match project.builder.as_mut() {
1385+
Some(builder) => {
1386+
//builder.iter().find(|&u| *u != user).ok_or(Error::<T>::UserAlreadyAssignedToProject)?;
1387+
builder.try_push(user.clone()).map_err(|_| Error::<T>::MaxBuildersPerProjectReached)?;
13881388
},
13891389
None => {
1390-
let devs = project.developer.get_or_insert(BoundedVec::<T::AccountId, T::MaxDevelopersPerProject>::default());
1391-
devs.try_push(user.clone()).map_err(|_| Error::<T>::MaxDevelopersPerProjectReached)?;
1390+
let devs = project.builder.get_or_insert(BoundedVec::<T::AccountId, T::MaxBuildersPerProject>::default());
1391+
devs.try_push(user.clone()).map_err(|_| Error::<T>::MaxBuildersPerProjectReached)?;
13921392
}
13931393
}
13941394
Ok(())
@@ -1460,16 +1460,16 @@ impl<T: Config> Pallet<T> {
14601460
ProxyRole::Administrator => {
14611461
return Err(Error::<T>::CannotRemoveAdminRole.into());
14621462
},
1463-
ProxyRole::Developer => {
1463+
ProxyRole::Builder => {
14641464
//TODO: Fix internal validations
14651465
//TODO: move logic to a helper function to avoid boilerplate
14661466
//Mutate project data
14671467
<ProjectsInfo<T>>::try_mutate::<_,_,DispatchError,_>(project_id, |project| {
14681468
let project = project.as_mut().ok_or(Error::<T>::ProjectNotFound)?;
1469-
match project.developer.as_mut() {
1470-
Some(developer) => {
1471-
//developer.clone().iter().find(|&u| *u == user).ok_or(Error::<T>::UserNotAssignedToProject)?;
1472-
developer.retain(|u| *u != user);
1469+
match project.builder.as_mut() {
1470+
Some(builder) => {
1471+
//builder.clone().iter().find(|&u| *u == user).ok_or(Error::<T>::UserNotAssignedToProject)?;
1472+
builder.retain(|u| *u != user);
14731473
},
14741474
None => {
14751475
return Err(Error::<T>::UserNotAssignedToProject.into());

‎pallets/proxy-financial/src/lib.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ pub mod pallet {
5555

5656
type RemoveOrigin: EnsureOrigin<Self::Origin>;
5757

58-
//TODO: Update pallet errors related to bounded vecs bounds
59-
//ie: BoundedVec<T::AccountId, T::MaxDevelopersPerProject>
60-
// -> MaxDevelopersPerProjectReached
61-
6258
#[pallet::constant]
6359
type ProjectNameMaxLen: Get<u32>;
6460

@@ -81,7 +77,7 @@ pub mod pallet {
8177
type CIDMaxLen: Get<u32>;
8278

8379
#[pallet::constant]
84-
type MaxDevelopersPerProject: Get<u32>;
80+
type MaxBuildersPerProject: Get<u32>;
8581

8682
#[pallet::constant]
8783
type MaxInvestorsPerProject: Get<u32>;
@@ -327,8 +323,8 @@ pub mod pallet {
327323
UserNotAssignedToProject,
328324
/// Can not register administator role
329325
CannotRegisterAdminRole,
330-
/// Max number of developers per project reached
331-
MaxDevelopersPerProjectReached,
326+
/// Max number of builders per project reached
327+
MaxBuildersPerProjectReached,
332328
/// Max number of investors per project reached
333329
MaxInvestorsPerProjectReached,
334330
/// Max number of issuers per project reached

‎pallets/proxy-financial/src/mock.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ parameter_types! {
6666
pub const MaxProjectsPerUser:u32 = 10;
6767
pub const CIDMaxLen:u32 = 100;
6868
pub const MaxUserPerProject:u32 = 50;
69-
pub const MaxDevelopersPerProject:u32 = 1;
69+
pub const MaxBuildersPerProject:u32 = 1;
7070
pub const MaxInvestorsPerProject:u32 = 50;
7171
pub const MaxIssuersPerProject:u32 = 1;
7272
pub const MaxRegionalCenterPerProject:u32 = 1;
@@ -89,7 +89,7 @@ impl pallet_proxy_financial::Config for Test {
8989
type MaxProjectsPerUser = MaxProjectsPerUser;
9090
type CIDMaxLen = CIDMaxLen;
9191
type MaxUserPerProject = MaxUserPerProject;
92-
type MaxDevelopersPerProject = MaxDevelopersPerProject;
92+
type MaxBuildersPerProject = MaxBuildersPerProject;
9393
type MaxInvestorsPerProject = MaxInvestorsPerProject;
9494
type MaxIssuersPerProject = MaxIssuersPerProject;
9595
type MaxRegionalCenterPerProject = MaxRegionalCenterPerProject;

‎pallets/proxy-financial/src/types.rs‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub type Documents<T> = BoundedVec<(FieldName,CID), <T as Config>::MaxDocuments>
1414
#[scale_info(skip_type_params(T))]
1515
#[codec(mel_bound())]
1616
pub struct ProjectData<T: Config> {
17-
pub developer: Option<BoundedVec<T::AccountId, T::MaxDevelopersPerProject>>,
17+
pub builder: Option<BoundedVec<T::AccountId, T::MaxBuildersPerProject>>,
1818
pub investor: Option<BoundedVec<T::AccountId, T::MaxInvestorsPerProject>>,
1919
pub issuer: Option<BoundedVec<T::AccountId, T::MaxIssuersPerProject>>,
2020
pub regional_center: Option<BoundedVec<T::AccountId, T::MaxRegionalCenterPerProject>>,
@@ -57,7 +57,7 @@ pub struct UserData<T: Config> {
5757
#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebugNoBound, MaxEncodedLen, TypeInfo, Copy)]
5858
pub enum ProxyRole {
5959
Administrator,
60-
Developer,
60+
Builder,
6161
Investor,
6262
Issuer,
6363
RegionalCenter,
@@ -190,7 +190,7 @@ impl ProxyRole {
190190
//TOREVIEW: optimization (?)
191191
//Self::Administrator => b"Administrator".to_vec(),
192192
Self::Administrator => "Administrator".as_bytes().to_vec(),
193-
Self::Developer => "Developer".as_bytes().to_vec(),
193+
Self::Builder => "Builder".as_bytes().to_vec(),
194194
Self::Investor => "Investor".as_bytes().to_vec(),
195195
Self::Issuer => "Issuer".as_bytes().to_vec(),
196196
Self::RegionalCenter => "RegionalCenter".as_bytes().to_vec(),
@@ -203,7 +203,7 @@ impl ProxyRole {
203203

204204
pub fn enum_to_vec() -> Vec<Vec<u8>>{
205205
use crate::types::ProxyRole::*;
206-
[Administrator.to_vec(), Developer.to_vec(), Investor.to_vec(), Issuer.to_vec(), RegionalCenter.to_vec()].to_vec()
206+
[Administrator.to_vec(), Builder.to_vec(), Investor.to_vec(), Issuer.to_vec(), RegionalCenter.to_vec()].to_vec()
207207
}
208208

209209
}
@@ -270,36 +270,26 @@ impl ProxyPermission {
270270

271271
pub fn builder_permissions() -> Vec<Vec<u8>>{
272272
use crate::types::ProxyPermission::*;
273-
let developer_permissions = [
273+
[
274274
EditUser.to_vec(),
275275
SubmitDrawdown.to_vec(),
276276
UpBulkupload.to_vec(),
277-
].to_vec();
278-
developer_permissions
277+
].to_vec()
279278
}
280279

281280
pub fn investor_permissions() -> Vec<Vec<u8>>{
282281
use crate::types::ProxyPermission::*;
283-
let developer_permissions = [
284-
EditUser.to_vec(),
285-
].to_vec();
286-
developer_permissions
282+
[EditUser.to_vec(),].to_vec()
287283
}
288284

289285
pub fn issuer_permissions() -> Vec<Vec<u8>>{
290286
use crate::types::ProxyPermission::*;
291-
let developer_permissions = [
292-
EditUser.to_vec(),
293-
].to_vec();
294-
developer_permissions
287+
[EditUser.to_vec(),].to_vec()
295288
}
296289

297290
pub fn regional_center_permissions() -> Vec<Vec<u8>>{
298291
use crate::types::ProxyPermission::*;
299-
let developer_permissions = [
300-
EditUser.to_vec(),
301-
].to_vec();
302-
developer_permissions
292+
[EditUser.to_vec(),].to_vec()
303293
}
304294

305295

‎runtime/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ parameter_types! {
562562
pub const MaxProjectsPerUser:u32 = 10;
563563
pub const CIDMaxLen:u32 = 100;
564564
pub const MaxUserPerProject:u32 = 50;
565-
pub const MaxDevelopersPerProject:u32 = 1;
565+
pub const MaxBuildersPerProject:u32 = 1;
566566
pub const MaxInvestorsPerProject:u32 = 50;
567567
pub const MaxIssuersPerProject:u32 = 1;
568568
pub const MaxRegionalCenterPerProject:u32 = 1;
@@ -592,7 +592,7 @@ impl pallet_proxy_financial::Config for Runtime {
592592
type MaxProjectsPerUser = MaxProjectsPerUser;
593593
type CIDMaxLen = CIDMaxLen;
594594
type MaxUserPerProject = MaxUserPerProject;
595-
type MaxDevelopersPerProject = MaxDevelopersPerProject;
595+
type MaxBuildersPerProject = MaxBuildersPerProject;
596596
type MaxInvestorsPerProject = MaxInvestorsPerProject;
597597
type MaxIssuersPerProject = MaxIssuersPerProject;
598598
type MaxRegionalCenterPerProject = MaxRegionalCenterPerProject;

0 commit comments

Comments
 (0)