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

Remove deprecated getter() calls from all pallets #428

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Remove deprecated getter() calls from all pallets #428

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
a25e6f0
Remove deprecated getter() calls from all pallets
vatsa287 Apr 11, 2024
5976c1a
Change to .get() in tests
vatsa287 Apr 12, 2024
3ebf8c6
Add todo for test-utils/runtime getter() change
vatsa287 Apr 15, 2024
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
6 changes: 0 additions & 6 deletions pallets/asset/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,15 @@ pub mod pallet {

/// asset entry identifiers with details stored on chain.
#[pallet::storage]
#[pallet::getter(fn assets)]
pub type Assets<T> = StorageMap<_, Blake2_128Concat, AssetIdOf, AssetEntryOf<T>, OptionQuery>;

/// asset vc entry idenitfiers with details stored on chain.
#[pallet::storage]
#[pallet::getter(fn vc_assets)]
pub type VCAssets<T> =
StorageMap<_, Blake2_128Concat, AssetIdOf, VCAssetEntryOf<T>, OptionQuery>;

/// asset entry identifiers with details stored on chain.
#[pallet::storage]
#[pallet::getter(fn distribution)]
pub type Distribution<T: Config> = StorageMap<
_,
Blake2_128Concat,
Expand All @@ -162,7 +159,6 @@ pub mod pallet {

/// asset entry identifiers with details stored on chain.
#[pallet::storage]
#[pallet::getter(fn issued)]
pub type Issuance<T> = StorageDoubleMap<
_,
Twox64Concat,
Expand All @@ -175,7 +171,6 @@ pub mod pallet {

/// asset vc entry identifiers with details stored on chain.
#[pallet::storage]
#[pallet::getter(fn vc_issued)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the places we were using custom getters. need to check the SDK impact of this change as well

pub type VCIssuance<T> = StorageDoubleMap<
_,
Twox64Concat,
Expand All @@ -187,7 +182,6 @@ pub mod pallet {
>;

#[pallet::storage]
#[pallet::getter(fn asset_lookup)]
pub type AssetLookup<T> =
StorageMap<_, Blake2_128Concat, EntryHashOf<T>, AssetIdOf, OptionQuery>;

Expand Down
3 changes: 0 additions & 3 deletions pallets/chain-space/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,21 +162,18 @@ pub mod pallet {
/// Space information stored on chain.
/// It maps from an identifier to its details.
#[pallet::storage]
#[pallet::getter(fn spaces)]
pub type Spaces<T> = StorageMap<_, Blake2_128Concat, SpaceIdOf, SpaceDetailsOf<T>, OptionQuery>;

/// Space authorizations stored on-chain.
/// It maps from an identifier to delegates.
#[pallet::storage]
#[pallet::getter(fn authorizations)]
pub type Authorizations<T> =
StorageMap<_, Blake2_128Concat, AuthorizationIdOf, SpaceAuthorizationOf<T>, OptionQuery>;

/// Space delegates stored on chain.
/// It maps from an identifier to a bounded vec of delegates and
/// permissions.
#[pallet::storage]
#[pallet::getter(fn delegates)]
pub(super) type Delegates<T: Config> = StorageMap<
_,
Blake2_128Concat,
Expand Down
3 changes: 0 additions & 3 deletions pallets/did-name/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,16 @@ pub mod pallet {

/// Map of name -> ownership details.
#[pallet::storage]
#[pallet::getter(fn owner)]
pub type Owner<T> = StorageMap<_, Blake2_128Concat, DidNameOf<T>, DidNameOwnershipOf<T>>;

/// Map of owner -> name.
#[pallet::storage]
#[pallet::getter(fn names)]
pub type Names<T> = StorageMap<_, Blake2_128Concat, DidNameOwnerOf<T>, DidNameOf<T>>;

/// Map of name -> ().
///
/// If a name key is present, the name is currently banned.
#[pallet::storage]
#[pallet::getter(fn is_banned)]
pub type Banned<T> = StorageMap<_, Blake2_128Concat, DidNameOf<T>, ()>;

#[pallet::config]
Expand Down
3 changes: 0 additions & 3 deletions pallets/did/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,12 @@ pub mod pallet {
///
/// It maps from a DID identifier to the DID details.
#[pallet::storage]
#[pallet::getter(fn get_did)]
pub type Did<T> = StorageMap<_, Blake2_128Concat, DidIdentifierOf<T>, DidDetails<T>>;

/// Service endpoints associated with DIDs.
///
/// It maps from (DID identifier, service ID) to the service details.
#[pallet::storage]
#[pallet::getter(fn get_service_endpoints)]
pub type ServiceEndpoints<T> = StorageDoubleMap<
_,
Twox64Concat,
Expand All @@ -307,7 +305,6 @@ pub mod pallet {
/// It maps from a DID identifier to a unit tuple, for the sake of tracking
/// DID identifiers.
#[pallet::storage]
#[pallet::getter(fn get_deleted_did)]
pub(crate) type DidBlacklist<T> = StorageMap<_, Blake2_128Concat, DidIdentifierOf<T>, ()>;

#[pallet::event]
Expand Down
68 changes: 36 additions & 32 deletions pallets/did/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ fn check_successful_simple_ed25519_creation() {
Box::new(details),
did::DidSignature::from(signature),
));
let stored_did = Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
let stored_did =
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(stored_did.authentication_key, generate_key_id(&auth_did_key.clone().into()));
assert_eq!(stored_did.key_agreement_keys.len(), 0);
assert_eq!(stored_did.delegation_key, None);
Expand All @@ -81,7 +82,8 @@ fn check_successful_simple_sr25519_creation() {
Box::new(details),
did::DidSignature::from(signature),
));
let stored_did = Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
let stored_did =
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(stored_did.authentication_key, generate_key_id(&auth_did_key.clone().into()));
assert_eq!(stored_did.key_agreement_keys.len(), 0);
assert_eq!(stored_did.delegation_key, None);
Expand All @@ -107,7 +109,8 @@ fn check_successful_simple_ecdsa_creation() {
Box::new(details),
did::DidSignature::from(signature),
));
let stored_did = Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
let stored_did =
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(stored_did.authentication_key, generate_key_id(&auth_did_key.clone().into()));
assert_eq!(stored_did.key_agreement_keys.len(), 0);
assert_eq!(stored_did.delegation_key, None);
Expand Down Expand Up @@ -153,7 +156,8 @@ fn check_successful_complete_creation() {
did::DidSignature::from(signature),
));

let stored_did = Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
let stored_did =
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(stored_did.authentication_key, generate_key_id(&auth_did_key.clone().into()));
assert_eq!(stored_did.key_agreement_keys.len(), 2);
for key in enc_keys.iter().copied() {
Expand Down Expand Up @@ -188,7 +192,7 @@ fn check_successful_complete_creation() {
// We check that the service details in the creation operation have been all
// stored in the storage...
details.new_service_details.iter().for_each(|new_service| {
let stored_service = Did::get_service_endpoints(&alice_did, &new_service.id)
let stored_service = did::ServiceEndpoints::<Test>::get(&alice_did, &new_service.id)
.expect("Service endpoint should be stored.");
assert_eq!(stored_service.id, new_service.id);
assert_eq!(stored_service.urls, new_service.urls);
Expand Down Expand Up @@ -622,7 +626,7 @@ fn check_successful_authentication_key_update() {
DidVerificationKey::from(new_auth_key.public())
));
let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.authentication_key,
generate_key_id(&DidVerificationKey::from(new_auth_key.public()).into())
Expand Down Expand Up @@ -665,7 +669,7 @@ fn check_successful_authentication_key_max_public_keys_update() {
));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.authentication_key,
generate_key_id(&DidVerificationKey::from(new_auth_key.public()).into())
Expand Down Expand Up @@ -704,7 +708,7 @@ fn check_reused_key_authentication_key_update() {
));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.authentication_key,
generate_key_id(&DidVerificationKey::from(new_auth_key.public()).into())
Expand Down Expand Up @@ -801,7 +805,7 @@ fn check_successful_delegation_key_update() {
assert_ok!(Did::set_delegation_key(origin, DidVerificationKey::from(new_del_key.public())));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.delegation_key,
Some(generate_key_id(&DidVerificationKey::from(new_del_key.public()).into()))
Expand Down Expand Up @@ -846,7 +850,7 @@ fn check_successful_delegation_key_max_public_keys_update() {
assert_ok!(Did::set_delegation_key(origin, DidVerificationKey::from(new_del_key.public())));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.delegation_key,
Some(generate_key_id(&DidVerificationKey::from(new_del_key.public()).into()))
Expand Down Expand Up @@ -882,7 +886,7 @@ fn check_reused_key_delegation_key_update() {
assert_ok!(Did::set_delegation_key(origin, DidVerificationKey::from(new_del_key.public())));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.delegation_key,
Some(generate_key_id(&DidVerificationKey::from(new_del_key.public()).into()))
Expand Down Expand Up @@ -1002,7 +1006,7 @@ fn check_successful_delegation_key_deletion() {
assert_ok!(Did::remove_delegation_key(origin));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert!(new_did_details.delegation_key.is_none());
let public_keys = new_did_details.public_keys;
// Total is -1 for the removal + auth key = 1
Expand Down Expand Up @@ -1032,7 +1036,7 @@ fn check_successful_reused_delegation_key_deletion() {
assert_ok!(Did::remove_delegation_key(origin));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert!(new_did_details.delegation_key.is_none());
let public_keys = new_did_details.public_keys;
// Total should be unchanged as the key was re-used so it is not completely
Expand Down Expand Up @@ -1096,7 +1100,7 @@ fn check_successful_assertion_key_update() {
System::set_block_number(new_block_number);
assert_ok!(Did::set_assertion_key(origin, DidVerificationKey::from(new_att_key.public())));
let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.assertion_key,
Some(generate_key_id(&DidVerificationKey::from(new_att_key.public()).into()))
Expand Down Expand Up @@ -1140,7 +1144,7 @@ fn check_successful_assertion_key_max_public_keys_update() {
System::set_block_number(new_block_number);
assert_ok!(Did::set_assertion_key(origin, DidVerificationKey::from(new_att_key.public())));
let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.assertion_key,
Some(generate_key_id(&DidVerificationKey::from(new_att_key.public()).into()))
Expand Down Expand Up @@ -1176,7 +1180,7 @@ fn check_reused_key_assertion_key_update() {
assert_ok!(Did::set_assertion_key(origin, DidVerificationKey::from(new_att_key.public())));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(
new_did_details.assertion_key,
Some(generate_key_id(&DidVerificationKey::from(new_att_key.public()).into()))
Expand Down Expand Up @@ -1296,7 +1300,7 @@ fn check_successful_assertion_key_deletion() {
assert_ok!(Did::remove_assertion_key(origin));

let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert!(new_did_details.assertion_key.is_none());
let public_keys = new_did_details.public_keys;
// Total is -1 for the removal + auth key = 1
Expand Down Expand Up @@ -1325,7 +1329,7 @@ fn check_successful_reused_assertion_key_deletion() {
did::Did::<Test>::insert(alice_did.clone(), old_did_details.clone());
assert_ok!(Did::remove_assertion_key(origin));
let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert!(new_did_details.assertion_key.is_none());
let public_keys = new_did_details.public_keys;
// Total should be unchanged as the key was re-used so it is not completely
Expand Down Expand Up @@ -1384,7 +1388,7 @@ fn check_successful_key_agreement_key_addition() {
System::set_block_number(new_block_number);
assert_ok!(Did::add_key_agreement_key(origin, new_key_agreement_key,));
let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert_eq!(new_did_details.key_agreement_keys.len(), 1);
assert_eq!(
new_did_details.key_agreement_keys.iter().next().unwrap(),
Expand Down Expand Up @@ -1458,7 +1462,7 @@ fn check_successful_key_agreement_key_deletion() {
did::Did::<Test>::insert(alice_did.clone(), old_did_details);
assert_ok!(Did::remove_key_agreement_key(origin, generate_key_id(&old_enc_key.into()),));
let new_did_details =
Did::get_did(&alice_did).expect("ALICE_DID should be present on chain.");
did::Did::<Test>::get(&alice_did).expect("ALICE_DID should be present on chain.");
assert!(new_did_details.key_agreement_keys.is_empty());
let public_keys = new_did_details.public_keys;
// Total is -1 for the enc key removal + auth key = 1
Expand Down Expand Up @@ -1919,8 +1923,8 @@ fn check_successful_deletion_no_endpoints() {
did::Did::<Test>::insert(alice_did.clone(), did_details);
assert_eq!(did::pallet::DidEndpointsCount::<Test>::get(&alice_did), 0);
assert_ok!(Did::delete(origin, 0));
assert!(Did::get_did(alice_did.clone()).is_none());
assert!(Did::get_deleted_did(alice_did.clone()).is_some());
assert!(did::Did::<Test>::get(alice_did.clone()).is_none());
assert!(did::DidBlacklist::<Test>::get(alice_did.clone()).is_some());

assert_eq!(did::pallet::DidEndpointsCount::<Test>::get(&alice_did), 0);

Expand Down Expand Up @@ -1963,8 +1967,8 @@ fn check_successful_deletion_with_endpoints() {
assert_eq!(did::pallet::DidEndpointsCount::<Test>::get(&alice_did), 1);

assert_ok!(Did::delete(origin, 1));
assert!(Did::get_did(alice_did.clone()).is_none());
assert!(Did::get_deleted_did(alice_did.clone()).is_some());
assert!(did::Did::<Test>::get(alice_did.clone()).is_none());
assert!(did::DidBlacklist::<Test>::get(alice_did.clone()).is_some());

assert_eq!(did::pallet::DidEndpointsCount::<Test>::get(&alice_did), 0);

Expand Down Expand Up @@ -2584,8 +2588,8 @@ fn check_authentication_successful_operation_verification() {
&did::DidSignature::from(signature)
));
// Verify that the DID tx counter has increased
let did_details =
Did::get_did(&call_operation.operation.did).expect("DID should be present on chain.");
let did_details = did::Did::<Test>::get(&call_operation.operation.did)
.expect("DID should be present on chain.");
assert_eq!(did_details.last_tx_counter, mock_did.last_tx_counter + 1u64);
});
}
Expand Down Expand Up @@ -2614,8 +2618,8 @@ fn check_assertion_successful_operation_verification() {
&did::DidSignature::from(signature)
));
// Verify that the DID tx counter has increased
let did_details =
Did::get_did(&call_operation.operation.did).expect("DID should be present on chain.");
let did_details = did::Did::<Test>::get(&call_operation.operation.did)
.expect("DID should be present on chain.");
assert_eq!(did_details.last_tx_counter, mock_did.last_tx_counter + 1u64);
});
}
Expand Down Expand Up @@ -2644,8 +2648,8 @@ fn check_delegation_successful_operation_verification() {
&did::DidSignature::from(signature)
));
// Verify that the DID tx counter has increased
let did_details =
Did::get_did(&call_operation.operation.did).expect("DID should be present on chain.");
let did_details = did::Did::<Test>::get(&call_operation.operation.did)
.expect("DID should be present on chain.");
assert_eq!(did_details.last_tx_counter, mock_did.last_tx_counter + 1u64);
});
}
Expand Down Expand Up @@ -2698,8 +2702,8 @@ fn check_tx_counter_wrap_operation_verification() {
&did::DidSignature::from(signature)
));
// Verify that the DID tx counter has wrapped around
let did_details =
Did::get_did(&call_operation.operation.did).expect("DID should be present on chain.");
let did_details = did::Did::<Test>::get(&call_operation.operation.did)
.expect("DID should be present on chain.");
assert_eq!(did_details.last_tx_counter, 0u64);
});
}
Expand Down
Loading