diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
index 7671f53c0efc83448dcc97652c36bb31f5508aeb..25f0d7c110f94089b33ece2d43534196fb3f4f89 100644
--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -184,10 +184,7 @@ fn testnet_genesis(
identities: initial_identities
.iter()
.map(|(did, account)| {
- (
- *did,
- IdtyValue::new_valid(account.clone(), vec![IdtyRight::Ud]),
- )
+ IdtyValue::new_valid(*did, account.clone(), vec![IdtyRight::Ud])
})
.collect(),
},
diff --git a/pallets/identity/src/lib.rs b/pallets/identity/src/lib.rs
index a2684bbf101cb855021452eada3d1fa64ee5ec07..86e152b7f378c6b60eeb1c2b9694b43728905091 100644
--- a/pallets/identity/src/lib.rs
+++ b/pallets/identity/src/lib.rs
@@ -35,7 +35,7 @@ use frame_support::dispatch::Weight;
#[cfg(feature = "std")]
use serde::{Deserialize, Serialize};
use sp_runtime::traits::{AtLeast32BitUnsigned, One, Saturating, Zero};
-use sp_std::collections::btree_map::BTreeMap;
+use sp_std::collections::btree_set::BTreeSet;
use sp_std::fmt::Debug;
use sp_std::prelude::*;
@@ -128,7 +128,7 @@ pub mod pallet {
#[cfg_attr(feature = "std", derive(Deserialize, Serialize))]
#[derive(Encode, Decode, Clone, PartialEq, Eq)]
pub struct IdtyValue<T: Config> {
- pub index: T::IdtyIndex,
+ pub did: T::IdtyDid,
pub owner_key: T::AccountId,
pub removable_on: Option<T::BlockNumber>,
pub rights: Vec<(T::IdtyRight, Option<T::AccountId>)>,
@@ -136,9 +136,13 @@ pub mod pallet {
pub data: T::IdtyData,
}
impl<T: Config> IdtyValue<T> {
- pub fn new_valid(owner_key: T::AccountId, rights: Vec<T::IdtyRight>) -> Self {
+ pub fn new_valid(
+ did: T::IdtyDid,
+ owner_key: T::AccountId,
+ rights: Vec<T::IdtyRight>,
+ ) -> Self {
Self {
- index: Default::default(),
+ did,
owner_key,
removable_on: None,
rights: rights.into_iter().map(|right| (right, None)).collect(),
@@ -150,7 +154,7 @@ pub mod pallet {
impl<T: Config> Default for IdtyValue<T> {
fn default() -> Self {
Self {
- index: Default::default(),
+ did: Default::default(),
owner_key: Default::default(),
removable_on: None,
rights: Default::default(),
@@ -186,13 +190,13 @@ pub mod pallet {
#[pallet::storage]
#[pallet::getter(fn identity)]
pub type Identities<T: Config> =
- StorageMap<_, Blake2_128Concat, T::IdtyDid, IdtyValue<T>, ValueQuery>;
+ StorageMap<_, Blake2_128Concat, T::IdtyIndex, IdtyValue<T>, ValueQuery>;
- /// IdentitiesByIndex
+ /// IdentitiesByDid
#[pallet::storage]
- #[pallet::getter(fn identity_did_of_index)]
- pub type IdentitiesByIndex<T: Config> =
- StorageMap<_, Blake2_128Concat, T::IdtyIndex, T::IdtyDid, ValueQuery>;
+ #[pallet::getter(fn identity_by_did)]
+ pub type IdentitiesByDid<T: Config> =
+ StorageMap<_, Blake2_128Concat, T::IdtyDid, T::IdtyIndex, ValueQuery>;
#[pallet::storage]
pub(super) type NextIdtyIndex<T: Config> = StorageValue<_, T::IdtyIndex, ValueQuery>;
@@ -204,14 +208,19 @@ pub mod pallet {
/// Identities by removed block
#[pallet::storage]
#[pallet::getter(fn removable_on)]
- pub type IdentitiesRemovableOn<T: Config> =
- StorageMap<_, Blake2_128Concat, T::BlockNumber, Vec<(T::IdtyDid, IdtyStatus)>, ValueQuery>;
+ pub type IdentitiesRemovableOn<T: Config> = StorageMap<
+ _,
+ Blake2_128Concat,
+ T::BlockNumber,
+ Vec<(T::IdtyIndex, IdtyStatus)>,
+ ValueQuery,
+ >;
// GENESIS //
#[pallet::genesis_config]
pub struct GenesisConfig<T: Config> {
- pub identities: BTreeMap<T::IdtyDid, IdtyValue<T>>,
+ pub identities: Vec<IdtyValue<T>>,
}
#[cfg(feature = "std")]
@@ -226,7 +235,13 @@ pub mod pallet {
#[pallet::genesis_build]
impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
fn build(&self) {
- for idty_value in self.identities.values() {
+ let mut dids = BTreeSet::new();
+ for idty_value in &self.identities {
+ assert!(
+ !dids.contains(&idty_value.did),
+ "Did {:?} is present twice",
+ idty_value.did
+ );
if idty_value.status == IdtyStatus::Validated {
if idty_value.rights.is_empty() {
assert!(idty_value.removable_on.is_some());
@@ -237,15 +252,20 @@ pub mod pallet {
assert!(idty_value.removable_on.is_some());
assert!(idty_value.rights.is_empty())
}
+ dids.insert(idty_value.did);
}
<StorageVersion<T>>::put(Releases::V1_0_0);
<IdentitiesCount<T>>::put(self.identities.len() as u64);
- for (idty_did, idty_value) in &self.identities {
+ for idty_value in &self.identities {
+ let idty_index = Pallet::<T>::get_next_idty_index();
if let Some(removable_on) = idty_value.removable_on {
- <IdentitiesRemovableOn<T>>::append(removable_on, (idty_did, idty_value.status))
+ <IdentitiesRemovableOn<T>>::append(
+ removable_on,
+ (idty_index, idty_value.status),
+ )
}
- <Identities<T>>::insert(idty_did, idty_value);
+ <Identities<T>>::insert(idty_index, idty_value);
}
}
}
@@ -309,14 +329,14 @@ pub mod pallet {
#[pallet::weight(0)]
pub fn create_identity(
origin: OriginFor<T>,
- creator: T::IdtyDid,
+ creator: T::IdtyIndex,
idty_did: T::IdtyDid,
owner_key: T::AccountId,
) -> DispatchResultWithPostInfo {
- if !T::EnsureIdtyCallAllowed::create_identity(origin, &creator, &idty_did, &owner_key) {
+ if !T::EnsureIdtyCallAllowed::create_identity(origin, creator, &idty_did, &owner_key) {
return Err(Error::<T>::IdtyCreationNotAllowed.into());
}
- if <Identities<T>>::contains_key(&idty_did) {
+ if <IdentitiesByDid<T>>::contains_key(&idty_did) {
return Err(Error::<T>::IdtyAlreadyExist.into());
}
@@ -325,16 +345,16 @@ pub mod pallet {
let idty_index = Self::get_next_idty_index();
<Identities<T>>::insert(
- idty_did,
+ idty_index,
IdtyValue {
- index: idty_index,
+ did: idty_did,
owner_key: owner_key.clone(),
removable_on: Some(removable_on),
..Default::default()
},
);
- <IdentitiesByIndex<T>>::insert(idty_index, idty_did);
- IdentitiesRemovableOn::<T>::append(removable_on, (idty_did, IdtyStatus::Created));
+ <IdentitiesByDid<T>>::insert(idty_did, idty_index);
+ IdentitiesRemovableOn::<T>::append(removable_on, (idty_index, IdtyStatus::Created));
Self::inc_identities_counter();
Self::deposit_event(Event::IdtyCreated(idty_did, owner_key));
Ok(().into())
@@ -343,10 +363,11 @@ pub mod pallet {
pub fn confirm_identity(
origin: OriginFor<T>,
idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
) -> DispatchResultWithPostInfo {
let who = ensure_signed(origin)?;
- if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_did) {
+ if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_index) {
if who == idty_value.owner_key {
if idty_value.status != IdtyStatus::Created {
return Err(Error::<T>::IdtyAlreadyConfirmed.into());
@@ -358,10 +379,10 @@ pub mod pallet {
idty_value.status = IdtyStatus::ConfirmedByOwner;
let owner_key = idty_value.owner_key.clone();
- <Identities<T>>::insert(idty_did, idty_value);
+ <Identities<T>>::insert(idty_index, idty_value);
IdentitiesRemovableOn::<T>::append(
removable_on,
- (idty_did, IdtyStatus::ConfirmedByOwner),
+ (idty_index, IdtyStatus::ConfirmedByOwner),
);
Self::deposit_event(Event::IdtyConfirmed(idty_did));
T::OnIdtyConfirmed::on_idty_confirmed(idty_did, owner_key, removable_on);
@@ -376,11 +397,11 @@ pub mod pallet {
#[pallet::weight(0)]
pub fn validate_identity(
origin: OriginFor<T>,
- idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
) -> DispatchResultWithPostInfo {
T::IdtyValidationOrigin::ensure_origin(origin)?;
- if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_did) {
+ if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_index) {
match idty_value.status {
IdtyStatus::Created => Err(Error::<T>::IdtyNotConfirmedByOwner.into()),
IdtyStatus::ConfirmedByOwner => {
@@ -389,14 +410,15 @@ pub mod pallet {
idty_value.removable_on = Some(removable_on);
idty_value.status = IdtyStatus::Validated;
let owner_key = idty_value.owner_key.clone();
+ let did = idty_value.did;
- <Identities<T>>::insert(idty_did, idty_value);
+ <Identities<T>>::insert(idty_index, idty_value);
<IdentitiesRemovableOn<T>>::append(
removable_on,
- (idty_did, IdtyStatus::Validated),
+ (idty_index, IdtyStatus::Validated),
);
- Self::deposit_event(Event::IdtyValidated(idty_did));
- T::OnIdtyValidated::on_idty_validated(idty_did, owner_key)?;
+ Self::deposit_event(Event::IdtyValidated(did));
+ T::OnIdtyValidated::on_idty_validated(idty_index, owner_key)?;
Ok(().into())
}
IdtyStatus::Validated => Err(Error::<T>::IdtyAlreadyValidated.into()),
@@ -408,12 +430,12 @@ pub mod pallet {
#[pallet::weight(0)]
pub fn validate_identity_and_add_rights(
origin: OriginFor<T>,
- idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
rights: Vec<T::IdtyRight>,
) -> DispatchResultWithPostInfo {
T::IdtyValidationOrigin::ensure_origin(origin)?;
- if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_did) {
+ if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_index) {
match idty_value.status {
IdtyStatus::Created => Err(Error::<T>::IdtyNotConfirmedByOwner.into()),
IdtyStatus::ConfirmedByOwner => {
@@ -421,13 +443,14 @@ pub mod pallet {
idty_value.rights = rights.iter().map(|right| (*right, None)).collect();
idty_value.status = IdtyStatus::Validated;
let owner_key = idty_value.owner_key.clone();
+ let did = idty_value.did;
- <Identities<T>>::insert(idty_did, idty_value);
- Self::deposit_event(Event::IdtyValidated(idty_did));
+ <Identities<T>>::insert(idty_index, idty_value);
+ Self::deposit_event(Event::IdtyValidated(did));
for right in rights {
- Self::deposit_event(Event::IdtyAcquireRight(idty_did, right));
+ Self::deposit_event(Event::IdtyAcquireRight(did, right));
}
- T::OnIdtyValidated::on_idty_validated(idty_did, owner_key)?;
+ T::OnIdtyValidated::on_idty_validated(idty_index, owner_key)?;
Ok(().into())
}
IdtyStatus::Validated => Err(Error::<T>::IdtyAlreadyValidated.into()),
@@ -439,12 +462,12 @@ pub mod pallet {
#[pallet::weight(0)]
pub fn add_right(
origin: OriginFor<T>,
- idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
right: T::IdtyRight,
) -> DispatchResultWithPostInfo {
T::AddRightOrigin::ensure_origin(origin)?;
- if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_did) {
+ if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_index) {
if idty_value.status != IdtyStatus::Validated {
return Err(Error::<T>::IdtyNotValidated.into());
}
@@ -453,19 +476,19 @@ pub mod pallet {
.rights
.binary_search_by(|(right_, _)| right.cmp(right_))
{
- idty_value.removable_on = None;
- idty_value.rights.insert(index, (right, None));
-
+ let did = idty_value.did;
let new_key = if right.allow_owner_key() {
Some(idty_value.owner_key.clone())
} else {
None
};
- <Identities<T>>::insert(idty_did, idty_value);
- Self::deposit_event(Event::<T>::IdtyAcquireRight(idty_did, right));
+ idty_value.removable_on = None;
+ idty_value.rights.insert(index, (right, None));
+ <Identities<T>>::insert(idty_index, idty_value);
+ Self::deposit_event(Event::<T>::IdtyAcquireRight(did, right));
if new_key.is_some() {
- T::OnRightKeyChange::on_right_key_change(idty_did, right, None, new_key);
+ T::OnRightKeyChange::on_right_key_change(idty_index, right, None, new_key);
}
Ok(().into())
} else {
@@ -478,12 +501,12 @@ pub mod pallet {
#[pallet::weight(0)]
pub fn del_right(
origin: OriginFor<T>,
- idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
right: T::IdtyRight,
) -> DispatchResultWithPostInfo {
T::DelRightOrigin::ensure_origin(origin)?;
- if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_did) {
+ if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_index) {
if idty_value.status != IdtyStatus::Validated {
return Err(Error::<T>::IdtyNotValidated.into());
}
@@ -492,6 +515,7 @@ pub mod pallet {
.rights
.binary_search_by(|(right_, _)| right.cmp(right_))
{
+ let did = idty_value.did;
let old_key_opt = if let Some(ref subkey) = idty_value.rights[index].1 {
Some(subkey.clone())
} else if right.allow_owner_key() {
@@ -507,15 +531,15 @@ pub mod pallet {
idty_value.removable_on = Some(removable_on);
<IdentitiesRemovableOn<T>>::append(
removable_on,
- (idty_did, IdtyStatus::Validated),
+ (idty_index, IdtyStatus::Validated),
);
}
- <Identities<T>>::insert(idty_did, idty_value);
- Self::deposit_event(Event::<T>::IdtyLostRight(idty_did, right));
+ <Identities<T>>::insert(idty_index, idty_value);
+ Self::deposit_event(Event::<T>::IdtyLostRight(did, right));
if old_key_opt.is_some() {
T::OnRightKeyChange::on_right_key_change(
- idty_did,
+ idty_index,
right,
old_key_opt,
None,
@@ -532,13 +556,13 @@ pub mod pallet {
#[pallet::weight(0)]
pub fn set_right_subkey(
origin: OriginFor<T>,
- idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
right: T::IdtyRight,
subkey_opt: Option<T::AccountId>,
) -> DispatchResultWithPostInfo {
let who = ensure_signed(origin)?;
- if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_did) {
+ if let Ok(mut idty_value) = <Identities<T>>::try_get(idty_index) {
if who == idty_value.owner_key {
if idty_value.status != IdtyStatus::Validated {
return Err(Error::<T>::IdtyNotValidated.into());
@@ -548,6 +572,7 @@ pub mod pallet {
.rights
.binary_search_by(|(right_, _)| right.cmp(right_))
{
+ let did = idty_value.did;
let old_subkey_opt = idty_value.rights[index].1.clone();
idty_value.rights[index].1 = subkey_opt.clone();
let new_key = if let Some(ref subkey) = subkey_opt {
@@ -558,15 +583,15 @@ pub mod pallet {
None
};
- <Identities<T>>::insert(idty_did, idty_value);
+ <Identities<T>>::insert(idty_index, idty_value);
Self::deposit_event(Event::<T>::IdtySetRightSubKey(
- idty_did,
+ did,
right,
old_subkey_opt.clone(),
subkey_opt,
));
T::OnRightKeyChange::on_right_key_change(
- idty_did,
+ idty_index,
right,
old_subkey_opt,
new_key,
@@ -643,15 +668,20 @@ pub mod pallet {
if let Some(identities) = IdentitiesRemovableOn::<T>::from_query_to_optional_value(
IdentitiesRemovableOn::<T>::take(block_number),
) {
- for (idty_did, idty_status) in identities {
- if let Ok(idty_val) = <Identities<T>>::try_get(idty_did) {
+ for (idty_index, idty_status) in identities {
+ if let Ok(idty_val) = <Identities<T>>::try_get(idty_index) {
if idty_val.removable_on == Some(block_number)
&& idty_val.status == idty_status
{
- <Identities<T>>::remove(idty_did);
+ let did = idty_val.did;
+ <Identities<T>>::remove(idty_index);
+ <IdentitiesByDid<T>>::remove(did);
Self::dec_identities_counter();
- total_weight +=
- T::OnIdtyRemoved::on_idty_removed(idty_did, idty_val.owner_key);
+ total_weight += T::OnIdtyRemoved::on_idty_removed(
+ idty_index,
+ did,
+ idty_val.owner_key,
+ );
}
}
}
diff --git a/pallets/identity/src/tests.rs b/pallets/identity/src/tests.rs
index ba6f183d0cad074c1d63f40e22ab0942e5a0452b..ba8efc3fe27fc92b15c496e694e633b929ae9292 100644
--- a/pallets/identity/src/tests.rs
+++ b/pallets/identity/src/tests.rs
@@ -21,11 +21,10 @@ use crate::Error;
use frame_support::assert_err;
use frame_support::assert_ok;
use frame_system::{EventRecord, Phase};
-use std::collections::BTreeMap;
#[test]
fn test_no_identity() {
- let identities = BTreeMap::new();
+ let identities = Vec::with_capacity(0);
new_test_ext(IdentityConfig { identities }).execute_with(|| {
assert_eq!(Identity::identities_count(), 0);
});
@@ -33,29 +32,25 @@ fn test_no_identity() {
#[test]
fn test_two_identities() {
- let mut identities = BTreeMap::new();
- identities.insert(
- Did(1),
+ let identities = vec![
crate::IdtyValue {
- index: 0,
+ did: Did(0),
owner_key: 1,
removable_on: None,
rights: vec![(Right::Right2, Some(10))],
status: crate::IdtyStatus::Validated,
data: (),
},
- );
- identities.insert(
- Did(2),
crate::IdtyValue {
- index: 1,
+ did: Did(1),
owner_key: 2,
removable_on: None,
rights: vec![(Right::Right1, Some(20))],
status: crate::IdtyStatus::Validated,
data: (),
},
- );
+ ];
+
new_test_ext(IdentityConfig { identities }).execute_with(|| {
// Should have two identities
assert_eq!(Identity::identities_count(), 2);
@@ -63,44 +58,44 @@ fn test_two_identities() {
// We need to initialize at least one block before any call
run_to_block(1);
- // Add right Right1 for Did(1)
+ // Add right Right1 for Did(0)
// Should succes and trigger the correct event
- assert_ok!(Identity::add_right(Origin::root(), Did(1), Right::Right1));
+ assert_ok!(Identity::add_right(Origin::root(), 0, Right::Right1));
let events = System::events();
assert_eq!(events.len(), 1);
assert_eq!(
events[0],
EventRecord {
phase: Phase::Initialization,
- event: Event::Identity(crate::Event::IdtyAcquireRight(Did(1), Right::Right1)),
+ event: Event::Identity(crate::Event::IdtyAcquireRight(Did(0), Right::Right1)),
topics: vec![],
}
);
- // Add right Right2 for Did(1)
- // Should fail because Did(1) already have this right
+ // Add right Right2 for Did(0)
+ // Should fail because Did(0) already have this right
assert_err!(
- Identity::add_right(Origin::root(), Did(1), Right::Right2),
+ Identity::add_right(Origin::root(), 0, Right::Right2),
Error::<Test>::RightAlreadyAdded
);
run_to_block(3);
- // Delete right Right1 for Did(2)
+ // Delete right Right1 for Did(1)
// Should succes and trigger the correct event
- assert_ok!(Identity::del_right(Origin::root(), Did(2), Right::Right1));
+ assert_ok!(Identity::del_right(Origin::root(), 1, Right::Right1));
let events = System::events();
assert_eq!(events.len(), 2);
assert_eq!(
events[1],
EventRecord {
phase: Phase::Initialization,
- event: Event::Identity(crate::Event::IdtyLostRight(Did(2), Right::Right1)),
+ event: Event::Identity(crate::Event::IdtyLostRight(Did(1), Right::Right1)),
topics: vec![],
}
);
- // The Did(2) identity has no more rights, the inactivity period must start to run
- let idty2 = Identity::identity(Did(2));
+ // The Did(1) identity has no more rights, the inactivity period must start to run
+ let idty2 = Identity::identity(1);
assert!(idty2.rights.is_empty());
assert_eq!(idty2.removable_on, Some(7));
});
diff --git a/pallets/identity/src/traits.rs b/pallets/identity/src/traits.rs
index 6fe563efb1d5cee42cfce2209d5e38949d2875e9..99c2059088e9d440934857251d2e423899e93036 100644
--- a/pallets/identity/src/traits.rs
+++ b/pallets/identity/src/traits.rs
@@ -26,7 +26,7 @@ use std::fmt::Debug;
pub trait EnsureIdtyCallAllowed<T: Config> {
fn create_identity(
origin: T::Origin,
- creator: &T::IdtyDid,
+ creator: T::IdtyIndex,
idty_did: &T::IdtyDid,
idty_owner_key: &T::AccountId,
) -> bool;
@@ -34,7 +34,7 @@ pub trait EnsureIdtyCallAllowed<T: Config> {
impl<T: Config> EnsureIdtyCallAllowed<T> for () {
fn create_identity(
origin: T::Origin,
- _creator: &T::IdtyDid,
+ _creator: T::IdtyIndex,
_idty_did: &T::IdtyDid,
_idty_owner_key: &T::AccountId,
) -> bool {
@@ -93,13 +93,13 @@ impl<T: Config> OnIdtyConfirmed<T> for () {
pub trait OnIdtyValidated<T: Config> {
fn on_idty_validated(
- idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
owner_key: T::AccountId,
) -> DispatchResultWithPostInfo;
}
impl<T: Config> OnIdtyValidated<T> for () {
fn on_idty_validated(
- _idty_did: T::IdtyDid,
+ _idty_index: T::IdtyIndex,
_owner_key: T::AccountId,
) -> DispatchResultWithPostInfo {
Ok(().into())
@@ -107,17 +107,25 @@ impl<T: Config> OnIdtyValidated<T> for () {
}
pub trait OnIdtyRemoved<T: Config> {
- fn on_idty_removed(idty_did: T::IdtyDid, owner_key: T::AccountId) -> Weight;
+ fn on_idty_removed(
+ idty_index: T::IdtyIndex,
+ idty_did: T::IdtyDid,
+ owner_key: T::AccountId,
+ ) -> Weight;
}
impl<T: Config> OnIdtyRemoved<T> for () {
- fn on_idty_removed(_idty_did: T::IdtyDid, _owner_key: T::AccountId) -> Weight {
+ fn on_idty_removed(
+ _idty_index: T::IdtyIndex,
+ _idty_did: T::IdtyDid,
+ _owner_key: T::AccountId,
+ ) -> Weight {
0
}
}
pub trait OnRightKeyChange<T: Config> {
fn on_right_key_change(
- idty_did: T::IdtyDid,
+ idty_index: T::IdtyIndex,
right: T::IdtyRight,
old_key: Option<T::AccountId>,
new_key: Option<T::AccountId>,
@@ -126,7 +134,7 @@ pub trait OnRightKeyChange<T: Config> {
impl<T: Config> OnRightKeyChange<T> for () {
fn on_right_key_change(
- _idty_did: T::IdtyDid,
+ _idty_index: T::IdtyIndex,
_right: T::IdtyRight,
_old_key: Option<T::AccountId>,
_new_key: Option<T::AccountId>,
diff --git a/runtime/src/authorizations.rs b/runtime/src/authorizations.rs
index 28bfa0ba5b865fdc6956e39e2942c9058d66605a..d293b1f6666a806452f7bb5002827ef66e2c7e54 100644
--- a/runtime/src/authorizations.rs
+++ b/runtime/src/authorizations.rs
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU Affero General Public License
// along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>.
-use crate::{AccountId, Identity, IdtyDid, IdtyRight, Origin, Runtime};
+use crate::{AccountId, Identity, IdtyDid, IdtyIndex, IdtyRight, Origin, Runtime};
pub struct EnsureIdtyCallAllowedImpl;
impl pallet_identity::traits::EnsureIdtyCallAllowed<Runtime> for EnsureIdtyCallAllowedImpl {
fn create_identity(
origin: Origin,
- creator: &IdtyDid,
+ creator: IdtyIndex,
_idty_did: &IdtyDid,
_idty_owner_key: &AccountId,
) -> bool {
diff --git a/runtime/src/handlers.rs b/runtime/src/handlers.rs
index c95d792d86f1dcdd00de09119833f4e6db6cb46f..2eaab7ed1be1fc5b5027f973e9101936b6743a13 100644
--- a/runtime/src/handlers.rs
+++ b/runtime/src/handlers.rs
@@ -14,20 +14,23 @@
// You should have received a copy of the GNU Affero General Public License
// along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>.
-use super::{AccountId, Identity, IdtyDid, IdtyRight, Origin, Runtime, UdAccountsStorage};
+use super::{AccountId, Identity, IdtyIndex, IdtyRight, Origin, Runtime, UdAccountsStorage};
use frame_support::pallet_prelude::DispatchResultWithPostInfo;
pub struct OnIdtyValidatedHandler;
impl pallet_identity::traits::OnIdtyValidated<Runtime> for OnIdtyValidatedHandler {
- fn on_idty_validated(idty_did: IdtyDid, _owner_key: AccountId) -> DispatchResultWithPostInfo {
- Identity::add_right(Origin::root(), idty_did, IdtyRight::Ud)
+ fn on_idty_validated(
+ idty_index: IdtyIndex,
+ _owner_key: AccountId,
+ ) -> DispatchResultWithPostInfo {
+ Identity::add_right(Origin::root(), idty_index, IdtyRight::Ud)
}
}
pub struct OnRightKeyChangeHandler;
impl pallet_identity::traits::OnRightKeyChange<Runtime> for OnRightKeyChangeHandler {
fn on_right_key_change(
- _idty_did: IdtyDid,
+ _idty_index: IdtyIndex,
right: IdtyRight,
old_key_opt: Option<AccountId>,
new_key_opt: Option<AccountId>,