refactor(schema): remove DomainId from TriggerId and `FindTrigger…

…sByDomainId` Signed-off-by: Nurzhan Sakén <nurzhan.sakenov@gmail.com>
hyperledger · May 23, 2024 · 8f9a95a · 8f9a95a
1 parent 2fc39f4
commit 8f9a95a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 27 deletions.
diff --git a/data_model/src/name.rs b/data_model/src/name.rs
@@ -67,7 +67,7 @@ impl Name {
     /// # Errors
     /// Fails if not valid [`Name`].
     fn validate_str(candidate: &str) -> Result<(), ParseError> {
-        const FORBIDDEN_CHARS: [char; 3] = ['@', '#', '$'];
+        const FORBIDDEN_CHARS: [char; 2] = ['@', '#'];
 
         if candidate.is_empty() {
             return Err(ParseError {
@@ -83,7 +83,7 @@ impl Name {
             #[allow(clippy::non_ascii_literal)]
             return Err(ParseError {
                 reason: "The `@` character is reserved for `account@domain` constructs, \
-                        `#` — for `asset#domain` and `$` — for `trigger$domain`.",
+                        and `#` — for `asset#domain`.",
             });
         }
         Ok(())
@@ -156,7 +156,7 @@ mod tests {
 
     use super::*;
 
-    const INVALID_NAMES: [&str; 5] = ["", " ", "@", "#", "$"];
+    const INVALID_NAMES: [&str; 4] = ["", " ", "@", "#"];
 
     #[test]
     fn deserialize_name() {

diff --git a/docs/source/references/schema.json b/docs/source/references/schema.json
@@ -1549,14 +1549,6 @@
       }
     ]
   },
-  "FindTriggersByDomainId": {
-    "Struct": [
-      {
-        "name": "domain_id",
-        "type": "DomainId"
-      }
-    ]
-  },
   "ForwardCursor": {
     "Struct": [
       {
@@ -2868,34 +2860,29 @@
         "discriminant": 32,
         "type": "FindTriggerKeyValueByIdAndKey"
       },
-      {
-        "tag": "FindTriggersByDomainId",
-        "discriminant": 33,
-        "type": "FindTriggersByDomainId"
-      },
       {
         "tag": "FindAllRoles",
-        "discriminant": 34,
+        "discriminant": 33,
         "type": "FindAllRoles"
       },
       {
         "tag": "FindAllRoleIds",
-        "discriminant": 35,
+        "discriminant": 34,
         "type": "FindAllRoleIds"
       },
       {
         "tag": "FindRoleByRoleId",
-        "discriminant": 36,
+        "discriminant": 35,
         "type": "FindRoleByRoleId"
       },
       {
         "tag": "FindRolesByAccountId",
-        "discriminant": 37,
+        "discriminant": 36,
         "type": "FindRolesByAccountId"
       },
       {
         "tag": "FindAllParameters",
-        "discriminant": 38,
+        "discriminant": 37,
         "type": "FindAllParameters"
       }
     ]
@@ -4151,10 +4138,6 @@
   },
   "TriggerId": {
     "Struct": [
-      {
-        "name": "domain_id",
-        "type": "Option<DomainId>"
-      },
       {
         "name": "name",
         "type": "Name"
@@ -4401,4 +4384,4 @@
   "u8": {
     "Int": "FixedWidth"
   }
-}
+}
diff --git a/smart_contract/executor/src/permission.rs b/smart_contract/executor/src/permission.rs
@@ -219,7 +219,6 @@ pub mod trigger {
     /// `authority` is owner of `trigger_id` if:
     /// - `trigger.action.authority` is `authority`
     /// - `trigger.action.authority.domain_id` is owned by `authority`
-    /// - `trigger.domain_id` is not none and domain is owned by `authority`
     ///
     /// # Errors
     /// - `FindTrigger` fails