[refactor] #3640: place permission tokens in a separate module

Signed-off-by: Marin Veršić <[email protected]>
hyperledger-iroha · Oct 6, 2023 · c26299a · c26299a
1 parent d865251
commit c26299a
Show file tree

Hide file tree

Showing 4 changed files with 546 additions and 563 deletions.
diff --git a/client/tests/integration/smartcontracts/validator_with_custom_token/src/lib.rs b/client/tests/integration/smartcontracts/validator_with_custom_token/src/lib.rs
@@ -95,7 +95,7 @@ impl Validator {
 
             for token in permission_tokens {
                 if let Ok(can_unregister_domain_token) =
-                    iroha_validator::default::domain::tokens::CanUnregisterDomain::try_from(token)
+                    iroha_validator::tokens::domain::CanUnregisterDomain::try_from(token)
                 {
                     found_accounts.push((account, can_unregister_domain_token.domain_id));
                     break;
@@ -108,7 +108,7 @@ impl Validator {
 
     fn replace_token(accounts: &[(Account, DomainId)]) -> MigrationResult {
         let can_unregister_domain_definition_id = PermissionTokenId::try_from(
-            iroha_validator::default::domain::tokens::CanUnregisterDomain::type_name(),
+            iroha_validator::tokens::domain::CanUnregisterDomain::type_name(),
         )
         .unwrap();
 
@@ -289,7 +289,7 @@ pub fn migrate(_block_height: u64) -> MigrationResult {
     let accounts = Validator::get_all_accounts_with_can_unregister_domain_permission()?;
 
     let mut schema = default_permission_token_schema();
-    schema.remove::<iroha_validator::default::domain::tokens::CanUnregisterDomain>();
+    schema.remove::<iroha_validator::tokens::domain::CanUnregisterDomain>();
     schema.insert::<token::CanControlDomainLives>();
 
     let (token_ids, schema_str) = schema.serialize();