Skip to content

Commit afe6b93

Browse files
amatsonkaliamatsonkali
committed
replaces pallet_id for hashed pallet name
1 parent c5e52ee commit afe6b93

File tree

6 files changed

+181
-153
lines changed

6 files changed

+181
-153
lines changed

‎pallets/gated-marketplace/src/functions.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ impl<T: Config> Pallet<T> {
1717
let mut super_roles = Vec::<Vec<u8>>::new();
1818
super_roles.push(MarketplaceRole::Owner.to_vec());
1919
super_roles.push(MarketplaceRole::Admin.to_vec());
20-
let super_role_ids = T::Rbac::create_and_set_roles(pallet_id, super_roles)?;
20+
let super_role_ids = T::Rbac::create_and_set_roles(pallet_id.clone(), super_roles)?;
2121
for super_role in super_role_ids{
22-
T::Rbac::create_and_set_permissions(pallet_id, super_role, Permission::admin_permissions())?;
22+
T::Rbac::create_and_set_permissions(pallet_id.clone(), super_role, Permission::admin_permissions())?;
2323
}
2424
// participant role and permissions
25-
let participant_role_id = T::Rbac::create_and_set_roles(pallet_id, [MarketplaceRole::Participant.to_vec()].to_vec())?;
26-
T::Rbac::create_and_set_permissions(pallet_id, participant_role_id[0], Permission::participant_permissions() )?;
25+
let participant_role_id = T::Rbac::create_and_set_roles(pallet_id.clone(), [MarketplaceRole::Participant.to_vec()].to_vec())?;
26+
T::Rbac::create_and_set_permissions(pallet_id.clone(), participant_role_id[0], Permission::participant_permissions() )?;
2727
// appraiser role and permissions
28-
let _appraiser_role_id = T::Rbac::create_and_set_roles(pallet_id, [MarketplaceRole::Appraiser.to_vec()].to_vec())?;
28+
let _appraiser_role_id = T::Rbac::create_and_set_roles(pallet_id.clone(), [MarketplaceRole::Appraiser.to_vec()].to_vec())?;
2929
// redemption specialist role and permissions
30-
let _redemption_role_id = T::Rbac::create_and_set_roles(pallet_id, [MarketplaceRole::RedemptionSpecialist.to_vec()].to_vec())?;
30+
let _redemption_role_id = T::Rbac::create_and_set_roles(pallet_id.clone(), [MarketplaceRole::RedemptionSpecialist.to_vec()].to_vec())?;
3131
Ok(())
3232
}
3333

@@ -853,8 +853,8 @@ impl<T: Config> Pallet<T> {
853853

854854

855855

856-
pub fn pallet_id()->u64{
857-
Self::index().try_into().unwrap()
856+
pub fn pallet_id()->Vec<u8>{
857+
Self::module_name().as_bytes().to_vec()
858858
}
859859

860860
}

‎pallets/gated-marketplace/src/tests.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ fn add_authority_appraiser_works() {
314314
let m_id = create_label("my marketplace").using_encoded(blake2_256);
315315
assert_ok!(GatedMarketplace::add_authority(Origin::signed(1), 3, MarketplaceRole::Appraiser, m_id));
316316
//assert!(GatedMarketplace::marketplaces_by_authority(3, m_id) == vec![MarketplaceRole::Appraiser]);
317-
assert!(RBAC::roles_by_user((3, GatedMarketplace::pallet_id(), m_id)).contains(&MarketplaceRole::Appraiser.id()));
317+
assert!(RBAC::roles_by_user((3, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).contains(&MarketplaceRole::Appraiser.id()));
318318
});
319319
}
320320

@@ -325,7 +325,7 @@ fn add_authority_admin_works() {
325325
let m_id = create_label("my marketplace").using_encoded(blake2_256);
326326
assert_ok!(GatedMarketplace::add_authority(Origin::signed(1), 3, MarketplaceRole::Admin, m_id));
327327
//assert!(GatedMarketplace::marketplaces_by_authority(3, m_id) == vec![MarketplaceRole::Admin]);
328-
assert!(RBAC::roles_by_user((3, GatedMarketplace::pallet_id(), m_id)).contains(&MarketplaceRole::Admin.id()));
328+
assert!(RBAC::roles_by_user((3, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).contains(&MarketplaceRole::Admin.id()));
329329
});
330330
}
331331

@@ -336,7 +336,7 @@ fn add_authority_redenmption_specialist_works() {
336336
let m_id = create_label("my marketplace").using_encoded(blake2_256);
337337
assert_ok!(GatedMarketplace::add_authority(Origin::signed(1), 3, MarketplaceRole::RedemptionSpecialist, m_id));
338338
//assert!(GatedMarketplace::marketplaces_by_authority(3, m_id) == vec![MarketplaceRole::RedemptionSpecialist]);
339-
assert!(RBAC::roles_by_user((3, GatedMarketplace::pallet_id(), m_id)).contains(&MarketplaceRole::RedemptionSpecialist.id()));
339+
assert!(RBAC::roles_by_user((3, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).contains(&MarketplaceRole::RedemptionSpecialist.id()));
340340
});
341341
}
342342

@@ -372,7 +372,7 @@ fn remove_authority_appraiser_works() {
372372
assert_ok!(GatedMarketplace::add_authority(Origin::signed(1), 3, MarketplaceRole::Appraiser, m_id));
373373
assert_ok!(GatedMarketplace::remove_authority(Origin::signed(1), 3, MarketplaceRole::Appraiser, m_id));
374374
//assert!(GatedMarketplace::marketplaces_by_authority(3, m_id) == vec![]);
375-
assert!(RBAC::roles_by_user((3, GatedMarketplace::pallet_id(), m_id)).is_empty());
375+
assert!(RBAC::roles_by_user((3, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).is_empty());
376376
});
377377
}
378378

@@ -384,7 +384,7 @@ fn remove_authority_admin_works() {
384384
assert_ok!(GatedMarketplace::add_authority(Origin::signed(1), 3, MarketplaceRole::Admin, m_id));
385385
assert_ok!(GatedMarketplace::remove_authority(Origin::signed(1), 3, MarketplaceRole::Admin, m_id));
386386
//assert!(GatedMarketplace::marketplaces_by_authority(3, m_id) == vec![]);
387-
assert!(RBAC::roles_by_user((3, GatedMarketplace::pallet_id(), m_id)).is_empty());
387+
assert!(RBAC::roles_by_user((3, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).is_empty());
388388
});
389389
}
390390

@@ -396,7 +396,7 @@ fn remove_authority_redemption_specialist_work() {
396396
assert_ok!(GatedMarketplace::add_authority(Origin::signed(1), 3, MarketplaceRole::RedemptionSpecialist, m_id));
397397
assert_ok!(GatedMarketplace::remove_authority(Origin::signed(1), 3, MarketplaceRole::RedemptionSpecialist, m_id));
398398
//assert!(GatedMarketplace::marketplaces_by_authority(3, m_id) == vec![]);
399-
assert!(RBAC::roles_by_user((3, GatedMarketplace::pallet_id(), m_id)).is_empty());
399+
assert!(RBAC::roles_by_user((3, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).is_empty());
400400
});
401401
}
402402

@@ -546,13 +546,13 @@ fn remove_marketplace_deletes_storage_from_marketplaces_by_authority_works(){
546546
assert_ok!(GatedMarketplace::remove_marketplace(Origin::signed(1), m_id));
547547

548548
//assert!(GatedMarketplace::marketplaces_by_authority(1, m_id) == vec![]);
549-
assert!(RBAC::roles_by_user((1, GatedMarketplace::pallet_id(), m_id)).is_empty());
549+
assert!(RBAC::roles_by_user((1, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).is_empty());
550550
//assert!(GatedMarketplace::marketplaces_by_authority(2, m_id) == vec![]);
551-
assert!(RBAC::roles_by_user((2, GatedMarketplace::pallet_id(), m_id)).is_empty());
551+
assert!(RBAC::roles_by_user((2, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).is_empty());
552552
//assert!(GatedMarketplace::marketplaces_by_authority(3, m_id) == vec![]);
553-
assert!(RBAC::roles_by_user((3, GatedMarketplace::pallet_id(), m_id)).is_empty());
553+
assert!(RBAC::roles_by_user((3, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).is_empty());
554554
//assert!(GatedMarketplace::marketplaces_by_authority(4, m_id) == vec![]);
555-
assert!(RBAC::roles_by_user((4, GatedMarketplace::pallet_id(), m_id)).is_empty());
555+
assert!(RBAC::roles_by_user((4, RBAC::to_id(GatedMarketplace::pallet_id()), m_id)).is_empty());
556556

557557
assert!(GatedMarketplace::marketplaces(m_id).is_none());
558558
});
@@ -569,24 +569,24 @@ fn remove_marketplace_deletes_storage_from_authorities_by_marketplace_works(){
569569
assert_ok!(GatedMarketplace::add_authority(Origin::signed(1), 4, MarketplaceRole::RedemptionSpecialist, m_id));
570570

571571
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::Owner) == vec![1]);
572-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::Owner.id())).contains(&1));
572+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::Owner.id())).contains(&1));
573573
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::Admin) == vec![2]);
574-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::Admin.id())).contains(&2));
574+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::Admin.id())).contains(&2));
575575
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::Appraiser) == vec![3]);
576-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::Appraiser.id())).contains(&3));
576+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::Appraiser.id())).contains(&3));
577577
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::RedemptionSpecialist) == vec![4]);
578-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::RedemptionSpecialist.id())).contains(&4));
578+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::RedemptionSpecialist.id())).contains(&4));
579579

580580
assert_ok!(GatedMarketplace::remove_marketplace(Origin::signed(1), m_id));
581581

582582
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::Owner) == vec![]);
583-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::Owner.id())).is_empty());
583+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::Owner.id())).is_empty());
584584
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::Admin) == vec![]);
585-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::Admin.id())).is_empty());
585+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::Admin.id())).is_empty());
586586
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::Appraiser) == vec![]);
587-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::Appraiser.id())).is_empty());
587+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::Appraiser.id())).is_empty());
588588
//assert!(GatedMarketplace::authorities_by_marketplace(m_id, MarketplaceRole::RedemptionSpecialist) == vec![]);
589-
assert!(RBAC::users_by_scope((GatedMarketplace::pallet_id(), m_id, MarketplaceRole::RedemptionSpecialist.id())).is_empty());
589+
assert!(RBAC::users_by_scope((RBAC::to_id(GatedMarketplace::pallet_id()), m_id, MarketplaceRole::RedemptionSpecialist.id())).is_empty());
590590
assert!(GatedMarketplace::marketplaces(m_id).is_none());
591591
});
592592
}

0 commit comments

Comments
 (0)