Added ContractsGenesis.json to gitignore

Signed-off-by: artem.ivanov <[email protected]>
DSRCorporation · Nov 24, 2023 · d1159f5 · d1159f5
1 parent e0fb07c
commit d1159f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/indy-besu/smart_contracts/.gitignore b/indy-besu/smart_contracts/.gitignore
@@ -6,5 +6,6 @@ artifacts
 typechain
 typechain-types
 compiled-contracts
+ContractsGenesis.json
 
 .openzeppelin
diff --git a/indy-besu/smart_contracts/contracts/cl/CredentialDefinitionRegistry.sol b/indy-besu/smart_contracts/contracts/cl/CredentialDefinitionRegistry.sol
@@ -64,7 +64,6 @@ contract CredentialDefinitionRegistry is CredentialDefinitionRegistryInterface,
         try _didRegistry.resolveDid(id) returns (DidDocumentStorage memory didDocumentStorage) {
             if (msg.sender != didDocumentStorage.metadata.creator)
                 revert SenderIsNotIssuerDidOwner(msg.sender, didDocumentStorage.metadata.creator);
-            _;
             if (didDocumentStorage.metadata.deactivated) revert IssuerHasBeenDeactivated(id);
             _;
         } catch (bytes memory reason) {

diff --git a/indy-besu/smart_contracts/contracts/cl/SchemaRegistry.sol b/indy-besu/smart_contracts/contracts/cl/SchemaRegistry.sol
@@ -46,11 +46,12 @@ contract SchemaRegistry is SchemaRegistryInterface, ControlledUpgradeable {
     /**
      * Checks that the Issuer DID exist, controlled by sender, and active
      */
+    // FIXME: this function is duplicated at CredentialDefinitionRegistry smart contract
+    //  Find a way how to avoid duplication - for example add common CLRegistryLibrary
     modifier _validIssuer(string memory id) {
         try _didRegistry.resolveDid(id) returns (DidDocumentStorage memory didDocumentStorage) {
             if (msg.sender != didDocumentStorage.metadata.creator)
                 revert SenderIsNotIssuerDidOwner(msg.sender, didDocumentStorage.metadata.creator);
-            _;
             if (didDocumentStorage.metadata.deactivated) revert IssuerHasBeenDeactivated(id);
             _;
         } catch (bytes memory reason) {