Refactoring & Tests (#5)

* init module tests + debug

* refactored & coverage 100%

* fix

* refactored example & bumped version

* fix

* typo lic

Author: dovgopoly

contracts/core/KYCCompliance.sol

@@ -40,7 +40,7 @@ abstract contract KYCCompliance is IKYCCompliance, KYCComplianceStorage, AgentAc
     }
 
     /// @inheritdoc IKYCCompliance
-    function isKYCed(TokenF.Context calldata ctx_) public view virtual returns (bool) {
+    function isKYCed(TokenF.Context memory ctx_) public view virtual returns (bool) {
         address[] memory regulatoryModules_ = getKYCModules();
 
         for (uint256 i = 0; i < regulatoryModules_.length; ++i) {

contracts/core/RegulatoryCompliance.sol

@@ -52,7 +52,7 @@ abstract contract RegulatoryCompliance is
     }
 
     /// @inheritdoc IRegulatoryCompliance
-    function transferred(TokenF.Context calldata ctx_) public virtual onlyThis {
+    function transferred(TokenF.Context memory ctx_) public virtual onlyThis {
         address[] memory regulatoryModules_ = getRegulatoryModules();
 
         for (uint256 i = 0; i < regulatoryModules_.length; ++i) {
@@ -61,7 +61,7 @@ abstract contract RegulatoryCompliance is
     }
 
     /// @inheritdoc IRegulatoryCompliance
-    function canTransfer(TokenF.Context calldata ctx_) public view virtual returns (bool) {
+    function canTransfer(TokenF.Context memory ctx_) public view virtual returns (bool) {
         address[] memory regulatoryModules_ = getRegulatoryModules();
 
         for (uint256 i = 0; i < regulatoryModules_.length; ++i) {

contracts/interfaces/IKYCCompliance.sol

@@ -56,5 +56,5 @@ interface IKYCCompliance is IKYCComplianceView {
      * @param ctx_ The context of the transaction
      * @return true if the passed context satisfies the checks on all modules
      */
-    function isKYCed(ITokenF.Context calldata ctx_) external view returns (bool);
+    function isKYCed(ITokenF.Context memory ctx_) external view returns (bool);
 }

contracts/interfaces/IRegulatoryCompliance.sol

@@ -56,7 +56,7 @@ interface IRegulatoryCompliance is IRegulatoryComplianceView {
      *
      * @param ctx_ The context of transaction
      */
-    function transferred(ITokenF.Context calldata ctx_) external;
+    function transferred(ITokenF.Context memory ctx_) external;
 
     /**
      * @notice Function that is used to verify that all necessary regulatory rules that have been added to `RegulatoryCompliance` have been met.
@@ -66,5 +66,5 @@ interface IRegulatoryCompliance is IRegulatoryComplianceView {
      * @param ctx_ The context of transaction
      * @return true if the passed context satisfies the rules in all installed regulatory modules.
      */
-    function canTransfer(ITokenF.Context calldata ctx_) external view returns (bool);
+    function canTransfer(ITokenF.Context memory ctx_) external view returns (bool);
 }

contracts/mock/core/ComplianceFalseHooksMock.sol

@@ -4,11 +4,11 @@ pragma solidity ^0.8.20;
 import {TokenF} from "../../core/TokenF.sol";
 
 contract ComplianceFalseHooksMock {
-    function isKYCed(TokenF.Context calldata) external returns (bool) {
+    function isKYCed(TokenF.Context memory) external pure returns (bool) {
         return false;
     }
 
-    function canTransfer(TokenF.Context calldata) external returns (bool) {
+    function canTransfer(TokenF.Context memory) external pure returns (bool) {
         return false;
     }
 }

contracts/mock/core/ComplianceRevertHooksMock.sol

@@ -4,15 +4,15 @@ pragma solidity ^0.8.20;
 import {TokenF} from "../../core/TokenF.sol";
 
 contract ComplianceRevertHooksMock {
-    function transferred(TokenF.Context calldata) external {
+    function transferred(TokenF.Context memory) external pure {
         revert("ComplianceRevertHooksMock: revert");
     }
 
-    function isKYCed(TokenF.Context calldata) external view returns (bool) {
+    function isKYCed(TokenF.Context memory) external pure returns (bool) {
         revert("ComplianceRevertHooksMock: revert");
     }
 
-    function canTransfer(TokenF.Context calldata) external view returns (bool) {
+    function canTransfer(TokenF.Context memory) external pure returns (bool) {
         revert("ComplianceRevertHooksMock: revert");
     }
 }

contracts/mock/core/KYCComplianceMock.sol

@@ -18,7 +18,7 @@ contract KYCComplianceMock is KYCCompliance {
         return super._KYCComplianceRole();
     }
 
-    function _KYCComplianceRole() internal view override returns (bytes32) {
+    function _KYCComplianceRole() internal pure override returns (bytes32) {
         return KYC_COMPLIANCE_ROLE;
     }
 }

contracts/mock/core/RegulatoryComplianceMock.sol

@@ -21,7 +21,7 @@ contract RegulatoryComplianceMock is RegulatoryCompliance {
         return super._regulatoryComplianceRole();
     }
 
-    function _regulatoryComplianceRole() internal view override returns (bytes32) {
+    function _regulatoryComplianceRole() internal pure override returns (bytes32) {
         return REGULATORY_COMPLIANCE_ROLE;
     }
 }

contracts/mock/modules/ModuleMock.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {TokenF} from "../../core/TokenF.sol";
+import {AbstractRegulatoryModule} from "../../modules/AbstractRegulatoryModule.sol";
+import {AbstractKYCModule} from "../../modules/AbstractKYCModule.sol";
+
+contract ModuleMock is AbstractRegulatoryModule, AbstractKYCModule {
+    bytes32 public constant MOCK_TOPIC = keccak256("MOCK");
+
+    function __ModuleMock_init(address tokenF_) external initializer {
+        __AbstractModule_init(tokenF_);
+        __AbstractRegulatoryModule_init();
+        __AbstractKYCModule_init();
+    }
+
+    function _handlerer() internal override {}
+
+    function handlerer() external {
+        _setHandler(MOCK_TOPIC, _handleMockTopic);
+    }
+
+    function __AbstractModuleDirect_init() external {
+        __AbstractModule_init(address(0));
+    }
+
+    function __AbstractRegulatoryModuleDirect_init() external {
+        __AbstractRegulatoryModule_init();
+    }
+
+    function __AbstractKYCModuleDirect_init() external {
+        __AbstractKYCModule_init();
+    }
+
+    function getClaimTopicKey(bytes4 selector_) external view returns (bytes32) {
+        TokenF.Context memory ctx_;
+        ctx_.selector = selector_;
+
+        return _getClaimTopicKey(ctx_);
+    }
+
+    function _handleMockTopic(TokenF.Context memory ctx_) internal view virtual returns (bool) {
+        return true;
+    }
+}

contracts/mock/modules/kyc/KYCCorrectModuleMock.sol

@@ -7,7 +7,7 @@ import {AbstractKYCModule} from "../../../modules/AbstractKYCModule.sol";
 contract KYCCorrectModuleMock is AbstractKYCModule {
     function _handlerer() internal override {}
 
-    function isKYCed(TokenF.Context calldata) public pure override returns (bool) {
+    function isKYCed(TokenF.Context memory) public pure override returns (bool) {
         return true;
     }
 }