Skip to content

Commit

Permalink
Remove IPAssetRenderer (#14)
Browse files Browse the repository at this point in the history
* feat: remove IPAssetRenderer
  • Loading branch information
jdubpark authored Mar 24, 2024
1 parent 08c70ba commit c7ac92f
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 352 deletions.
166 changes: 0 additions & 166 deletions contracts/registries/metadata/IPAssetRenderer.sol

This file was deleted.

11 changes: 0 additions & 11 deletions script/foundry/deployment/Main.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import { IP_RESOLVER_MODULE_KEY, DISPUTE_MODULE_KEY, ROYALTY_MODULE_KEY, LICENSI
import { IPMetadataProvider } from "contracts/registries/metadata/IPMetadataProvider.sol";
import { IPAccountRegistry } from "contracts/registries/IPAccountRegistry.sol";
import { IPAssetRegistry } from "contracts/registries/IPAssetRegistry.sol";
import { IPAssetRenderer } from "contracts/registries/metadata/IPAssetRenderer.sol";
import { ModuleRegistry } from "contracts/registries/ModuleRegistry.sol";
import { LicenseRegistry } from "contracts/registries/LicenseRegistry.sol";
import { LicensingModule } from "contracts/modules/licensing/LicensingModule.sol";
Expand Down Expand Up @@ -84,7 +83,6 @@ contract Main is Script, BroadcastManager, JsonDeploymentHandler {
// Misc.
Governance internal governance;
AccessController internal accessController;
IPAssetRenderer internal ipAssetRenderer;
IPResolver internal ipResolver;

// Mocks
Expand Down Expand Up @@ -186,15 +184,6 @@ contract Main is Script, BroadcastManager, JsonDeploymentHandler {
);
_postdeploy(contractKey, address(ipAssetRegistry));

contractKey = "IPAssetRenderer";
_predeploy(contractKey);
ipAssetRenderer = new IPAssetRenderer(
address(ipAssetRegistry),
address(licenseRegistry),
address(royaltyModule)
);
_postdeploy(contractKey, address(ipAssetRenderer));

contractKey = "RoyaltyModule";
_predeploy(contractKey);
royaltyModule = new RoyaltyModule(address(governance));
Expand Down
4 changes: 1 addition & 3 deletions test/foundry/integration/BaseIntegration.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ contract BaseIntegration is BaseTest {
DeployModuleCondition({ disputeModule: true, royaltyModule: true, licensingModule: true })
);
buildDeployPolicyCondition(DeployPolicyCondition({ arbitrationPolicySP: true, royaltyPolicyLAP: true }));
buildDeployMiscCondition(
DeployMiscCondition({ ipAssetRenderer: true, ipMetadataProvider: true, ipResolver: true })
);
buildDeployMiscCondition(DeployMiscCondition({ ipMetadataProvider: true, ipResolver: true }));
deployConditionally();
postDeploymentSetup();

Expand Down
4 changes: 1 addition & 3 deletions test/foundry/modules/ModuleBase.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ abstract contract ModuleBaseTest is BaseTest {
/// @notice Initializes the base module for testing.
function setUp() public virtual override(BaseTest) {
super.setUp();
buildDeployMiscCondition(
DeployMiscCondition({ ipAssetRenderer: false, ipMetadataProvider: false, ipResolver: true })
);
buildDeployMiscCondition(DeployMiscCondition({ ipMetadataProvider: false, ipResolver: true }));
deployConditionally();
postDeploymentSetup();

Expand Down
4 changes: 1 addition & 3 deletions test/foundry/modules/dispute/ArbitrationPolicySP.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ contract TestArbitrationPolicySP is BaseTest {
DeployModuleCondition({ disputeModule: true, royaltyModule: false, licensingModule: false })
);
buildDeployPolicyCondition(DeployPolicyCondition({ arbitrationPolicySP: true, royaltyPolicyLAP: true }));
buildDeployMiscCondition(
DeployMiscCondition({ ipAssetRenderer: false, ipMetadataProvider: false, ipResolver: true })
);
buildDeployMiscCondition(DeployMiscCondition({ ipMetadataProvider: false, ipResolver: true }));
deployConditionally();
postDeploymentSetup();

Expand Down
4 changes: 1 addition & 3 deletions test/foundry/modules/dispute/DisputeModule.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ contract DisputeModuleTest is BaseTest {
DeployModuleCondition({ disputeModule: true, royaltyModule: false, licensingModule: false })
);
buildDeployPolicyCondition(DeployPolicyCondition({ arbitrationPolicySP: true, royaltyPolicyLAP: true }));
buildDeployMiscCondition(
DeployMiscCondition({ ipAssetRenderer: false, ipMetadataProvider: false, ipResolver: true })
);
buildDeployMiscCondition(DeployMiscCondition({ ipMetadataProvider: false, ipResolver: true }));
deployConditionally();
postDeploymentSetup();

Expand Down
4 changes: 1 addition & 3 deletions test/foundry/modules/royalty/AncestorsVaultLAP.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ contract TestAncestorsVaultLAP is BaseTest {
DeployModuleCondition({ disputeModule: false, royaltyModule: true, licensingModule: false })
);
buildDeployPolicyCondition(DeployPolicyCondition({ arbitrationPolicySP: false, royaltyPolicyLAP: true }));
buildDeployMiscCondition(
DeployMiscCondition({ ipAssetRenderer: false, ipMetadataProvider: false, ipResolver: true })
);
buildDeployMiscCondition(DeployMiscCondition({ ipMetadataProvider: false, ipResolver: true }));
deployConditionally();
postDeploymentSetup();

Expand Down
Loading

0 comments on commit c7ac92f

Please sign in to comment.