diff --git a/contracts/modules/royalty/RoyaltyModule.sol b/contracts/modules/royalty/RoyaltyModule.sol index 3a50778ad..f8c07041c 100644 --- a/contracts/modules/royalty/RoyaltyModule.sol +++ b/contracts/modules/royalty/RoyaltyModule.sol @@ -223,8 +223,6 @@ contract RoyaltyModule is ) external onlyLicensingModule { RoyaltyModuleStorage storage $ = _getRoyaltyModuleStorage(); if (!$.isWhitelistedRoyaltyToken[token]) revert Errors.RoyaltyModule__NotWhitelistedRoyaltyToken(); - if (DISPUTE_MODULE.isIpTagged(receiverIpId)) revert Errors.RoyaltyModule__IpIsTagged(); - if (licenseRoyaltyPolicy == address(0)) revert Errors.RoyaltyModule__NoRoyaltyPolicySet(); if (!$.isWhitelistedRoyaltyPolicy[licenseRoyaltyPolicy]) revert Errors.RoyaltyModule__NotWhitelistedRoyaltyPolicy(); if (LICENSE_REGISTRY.isExpiredNow(receiverIpId)) revert Errors.RoyaltyModule__IpIsExpired(); diff --git a/contracts/modules/royalty/policies/RoyaltyPolicyLAP.sol b/contracts/modules/royalty/policies/RoyaltyPolicyLAP.sol index 16cec5d4d..bd032e8ce 100644 --- a/contracts/modules/royalty/policies/RoyaltyPolicyLAP.sol +++ b/contracts/modules/royalty/policies/RoyaltyPolicyLAP.sol @@ -217,11 +217,7 @@ contract RoyaltyPolicyLAP is /// @param ipId The to initialize the policy for /// @param parentIpIds The parent ipIds that the children ipId is being linked to (if any) /// @param licenseData The license data custom to each the royalty policy - function _initPolicy( - address ipId, - address[] memory parentIpIds, - bytes[] memory licenseData - ) internal onlyRoyaltyModule { + function _initPolicy(address ipId, address[] memory parentIpIds, bytes[] memory licenseData) internal { RoyaltyPolicyLAPStorage storage $ = _getRoyaltyPolicyLAPStorage(); // decode license data uint32[] memory parentRoyalties = new uint32[](parentIpIds.length); diff --git a/test/foundry/modules/royalty/RoyaltyModule.t.sol b/test/foundry/modules/royalty/RoyaltyModule.t.sol index 4bd5108f4..4d94b6da4 100644 --- a/test/foundry/modules/royalty/RoyaltyModule.t.sol +++ b/test/foundry/modules/royalty/RoyaltyModule.t.sol @@ -370,23 +370,6 @@ contract TestRoyaltyModule is BaseTest { assertEq(ipRoyaltyVaultUSDCBalAfter - ipRoyaltyVaultUSDCBalBefore, royaltyAmount); } - function test_RoyaltyModule_payLicenseMintingFee_revert_IpIsTagged() public { - // raise dispute - vm.startPrank(ipAccount1); - USDC.approve(address(arbitrationPolicySP), ARBITRATION_PRICE); - disputeModule.raiseDispute(ipAddr, string("urlExample"), "PLAGIARISM", ""); - vm.stopPrank(); - - // set dispute judgement - vm.startPrank(arbitrationRelayer); - disputeModule.setDisputeJudgement(1, true, ""); - - vm.startPrank(address(licensingModule)); - - vm.expectRevert(Errors.RoyaltyModule__IpIsTagged.selector); - royaltyModule.payLicenseMintingFee(ipAddr, ipAccount1, address(royaltyPolicyLAP), address(USDC), 100); - } - function test_RoyaltyModule_payLicenseMintingFee_revert_NotWhitelistedRoyaltyToken() public { uint256 royaltyAmount = 100 * 10 ** 6; address receiverIpId = address(2);