diff --git a/contracts/interfaces/modules/royalty/IRoyaltyModule.sol b/contracts/interfaces/modules/royalty/IRoyaltyModule.sol index d27b156fb..61bac9c43 100644 --- a/contracts/interfaces/modules/royalty/IRoyaltyModule.sol +++ b/contracts/interfaces/modules/royalty/IRoyaltyModule.sol @@ -45,10 +45,6 @@ interface IRoyaltyModule is IModule { /// @param ipId The ipId function isRoyaltyPolicyImmutable(address ipId) external view returns (bool); - /// @notice Sets the licensing module - /// @param licensingModule The address of the licensing module - function setLicensingModule(address licensingModule) external; - /// @notice Whitelist a royalty policy /// @param royaltyPolicy The address of the royalty policy /// @param allowed Indicates if the royalty policy is whitelisted or not diff --git a/contracts/interfaces/registries/ILicenseRegistry.sol b/contracts/interfaces/registries/ILicenseRegistry.sol index 3fdad0434..5dbfcfa0e 100644 --- a/contracts/interfaces/registries/ILicenseRegistry.sol +++ b/contracts/interfaces/registries/ILicenseRegistry.sol @@ -22,10 +22,6 @@ interface ILicenseRegistry is IERC1155 { Licensing.License licenseData ); - /// @notice Set the licensing module - /// @param newLicensingModule The address of the licensing module - function setLicensingModule(address newLicensingModule) external; - /// @notice Returns the address of the licensing module function licensingModule() external view returns (address); diff --git a/contracts/modules/royalty-module/RoyaltyModule.sol b/contracts/modules/royalty-module/RoyaltyModule.sol index 14cd15d90..6a0c73013 100644 --- a/contracts/modules/royalty-module/RoyaltyModule.sol +++ b/contracts/modules/royalty-module/RoyaltyModule.sol @@ -44,7 +44,7 @@ contract RoyaltyModule is IRoyaltyModule, Governable, ReentrancyGuard, BaseModul _; } - /// @notice Sets the license registry + /// @dev Sets the license registry /// @param _licensingModule The address of the license registry function setLicensingModule(address _licensingModule) external onlyProtocolAdmin { if (_licensingModule == address(0)) revert Errors.RoyaltyModule__ZeroLicensingModule(); diff --git a/test/foundry/utils/BaseTest.t.sol b/test/foundry/utils/BaseTest.t.sol index 609fc72d5..44ca9c6e7 100644 --- a/test/foundry/utils/BaseTest.t.sol +++ b/test/foundry/utils/BaseTest.t.sol @@ -11,6 +11,8 @@ import { AccessController } from "../../../contracts/AccessController.sol"; // solhint-disable-next-line max-line-length import { IP_RESOLVER_MODULE_KEY, REGISTRATION_MODULE_KEY, DISPUTE_MODULE_KEY, TAGGING_MODULE_KEY, ROYALTY_MODULE_KEY, LICENSING_MODULE_KEY } from "../../../contracts/lib/modules/Module.sol"; import { AccessPermission } from "../../../contracts/lib/AccessPermission.sol"; +import { RoyaltyModule } from "../../../contracts/modules/royalty-module/RoyaltyModule.sol"; +import { LicenseRegistry } from "../../../contracts/registries/LicenseRegistry.sol"; // test import { DeployHelper } from "./DeployHelper.t.sol"; @@ -155,7 +157,7 @@ contract BaseTest is Test, DeployHelper, LicensingHelper { require(address(royaltyModule) != address(0), "royaltyModule not set"); vm.startPrank(u.admin); - royaltyModule.setLicensingModule(getLicensingModule()); + RoyaltyModule(address(royaltyModule)).setLicensingModule(getLicensingModule()); royaltyModule.whitelistRoyaltyToken(address(erc20), true); if (address(royaltyPolicyLS) != address(0)) { royaltyModule.whitelistRoyaltyPolicy(address(royaltyPolicyLS), true); @@ -183,7 +185,7 @@ contract BaseTest is Test, DeployHelper, LicensingHelper { require(address(licenseRegistry) != address(0), "licenseRegistry not set"); vm.startPrank(u.admin); - licenseRegistry.setLicensingModule(getLicensingModule()); + LicenseRegistry(address(licenseRegistry)).setLicensingModule(getLicensingModule()); vm.stopPrank(); }