Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(upgrade script): add missing super.run() in upgrade scripts #81

Merged
merged 2 commits into from
Sep 27, 2024
Merged

fix(upgrade script): add missing super.run() in upgrade scripts #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81f3f4f
fix(upgrade-script): add missing `super.run()`
sebsadface Sep 27, 2024
c98877d
chore(integ-test): linting
sebsadface Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions script/upgrade/UpgradeDerivativeWorkflows.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ contract UpgradeDerivativeWorkflows is UpgradeHelper {
///
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
function run() public override {
super.run();
_beginBroadcast();
_deployDerivativeWorkflows();

Expand Down
1 change: 1 addition & 0 deletions script/upgrade/UpgradeGroupingWorkflows.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ contract UpgradeGroupingWorkflows is UpgradeHelper {
///
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
function run() public override {
super.run();
_beginBroadcast();
_deployGroupingWorkflows();

Expand Down
1 change: 1 addition & 0 deletions script/upgrade/UpgradeLicenseAttachmentWorkflows.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ contract UpgradeLicenseAttachmentWorkflows is UpgradeHelper {
///
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
function run() public override {
super.run();
_beginBroadcast();
_deployLicenseAttachmentWorkflows();

Expand Down
1 change: 1 addition & 0 deletions script/upgrade/UpgradeRegistrationWorkflows.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ contract UpgradeRegistrationWorkflows is UpgradeHelper {
///
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
function run() public override {
super.run();
_beginBroadcast();
_deployRegistrationWorkflows();

Expand Down
1 change: 1 addition & 0 deletions script/upgrade/UpgradeRoyaltyWorkflows.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ contract UpgradeRoyaltyWorkflows is UpgradeHelper {
///
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
function run() public override {
super.run();
_beginBroadcast();
_deployRoyaltyWorkflows();

Expand Down
1 change: 0 additions & 1 deletion script/upgrade/UpgradeSPGNFT.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ contract UpgradeSPGNFT is UpgradeHelper {
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
function run() public override {
super.run();

_beginBroadcast();
_deploySPGNFT();

Expand Down
15 changes: 10 additions & 5 deletions test/integration/workflows/DerivativeIntegration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ contract DerivativeIntegration is BaseIntegration {
_endBroadcast();
}

function _test_mintAndRegisterIpAndMakeDerivative() private
function _test_mintAndRegisterIpAndMakeDerivative()
private
logTest("test_DerivativeIntegration_mintAndRegisterIpAndMakeDerivative")
{
StoryUSD.mint(testSender, testMintFee * 2);
Expand Down Expand Up @@ -75,7 +76,8 @@ contract DerivativeIntegration is BaseIntegration {
});
}

function _test_registerIpAndMakeDerivative() private
function _test_registerIpAndMakeDerivative()
private
logTest("test_DerivativeIntegration_registerIpAndMakeDerivative")
{
StoryUSD.mint(testSender, testMintFee);
Expand Down Expand Up @@ -149,7 +151,8 @@ contract DerivativeIntegration is BaseIntegration {
});
}

function _test_mintAndRegisterIpAndMakeDerivativeWithLicenseTokens() private
function _test_mintAndRegisterIpAndMakeDerivativeWithLicenseTokens()
private
logTest("test_DerivativeIntegration_mintAndRegisterIpAndMakeDerivativeWithLicenseTokens")
{
StoryUSD.mint(testSender, testMintFee);
Expand Down Expand Up @@ -200,7 +203,8 @@ contract DerivativeIntegration is BaseIntegration {
});
}

function _test_registerIpAndMakeDerivativeWithLicenseTokens() private
function _test_registerIpAndMakeDerivativeWithLicenseTokens()
private
logTest("test_DerivativeIntegration_registerIpAndMakeDerivativeWithLicenseTokens")
{
StoryUSD.mint(testSender, testMintFee);
Expand Down Expand Up @@ -281,7 +285,8 @@ contract DerivativeIntegration is BaseIntegration {
});
}

function _test_multicall_mintAndRegisterIpAndMakeDerivative() private
function _test_multicall_mintAndRegisterIpAndMakeDerivative()
private
logTest("test_DerivativeIntegration_multicall_mintAndRegisterIpAndMakeDerivative")
{
uint256 numCalls = 10;
Expand Down
15 changes: 10 additions & 5 deletions test/integration/workflows/GroupingIntegration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ contract GroupingIntegration is BaseIntegration {
_endBroadcast();
}

function _test_GroupingIntegration_mintAndRegisterIpAndAttachLicenseAndAddToGroup() private
function _test_GroupingIntegration_mintAndRegisterIpAndAttachLicenseAndAddToGroup()
private
logTest("test_GroupingIntegration_mintAndRegisterIpAndAttachLicenseAndAddToGroup")
{
uint256 deadline = block.timestamp + 1000;
Expand Down Expand Up @@ -83,7 +84,8 @@ contract GroupingIntegration is BaseIntegration {
assertEq(licenseTermsId, testLicenseTermsId);
}

function _test_GroupingIntegration_registerIpAndAttachLicenseAndAddToGroup() private
function _test_GroupingIntegration_registerIpAndAttachLicenseAndAddToGroup()
private
logTest("test_GroupingIntegration_registerIpAndAttachLicenseAndAddToGroup")
{
StoryUSD.mint(testSender, testMintFee);
Expand Down Expand Up @@ -145,7 +147,8 @@ contract GroupingIntegration is BaseIntegration {
assertEq(licenseTermsId, testLicenseTermsId);
}

function _test_GroupingIntegration_registerGroupAndAttachLicenseAndAddIps() private
function _test_GroupingIntegration_registerGroupAndAttachLicenseAndAddIps()
private
logTest("test_GroupingIntegration_registerGroupAndAttachLicenseAndAddIps")
{
address newGroupId = groupingWorkflows.registerGroupAndAttachLicenseAndAddIps({
Expand All @@ -170,7 +173,8 @@ contract GroupingIntegration is BaseIntegration {
assertEq(licenseTermsId, testLicenseTermsId);
}

function _test_GroupingIntegration_multicall_mintAndRegisterIpAndAttachLicenseAndAddToGroup() private
function _test_GroupingIntegration_multicall_mintAndRegisterIpAndAttachLicenseAndAddToGroup()
private
logTest("test_GroupingIntegration_multicall_mintAndRegisterIpAndAttachLicenseAndAddToGroup")
{
uint256 deadline = block.timestamp + 1000;
Expand Down Expand Up @@ -227,7 +231,8 @@ contract GroupingIntegration is BaseIntegration {
}
}

function _test_GroupingIntegration_multicall_registerIpAndAttachLicenseAndAddToGroup() private
function _test_GroupingIntegration_multicall_registerIpAndAttachLicenseAndAddToGroup()
private
logTest("test_GroupingIntegration_multicall_registerIpAndAttachLicenseAndAddToGroup")
{
uint256 numCalls = 10;
Expand Down
9 changes: 6 additions & 3 deletions test/integration/workflows/LicenseAttachmentIntegration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ contract LicenseAttachmentIntegration is BaseIntegration {
_endBroadcast();
}

function _test_LicenseAttachmentIntegration_registerPILTermsAndAttach() private
function _test_LicenseAttachmentIntegration_registerPILTermsAndAttach()
private
logTest("test_LicenseAttachmentIntegration_registerPILTermsAndAttach")
{
StoryUSD.mint(testSender, testMintFee);
Expand Down Expand Up @@ -75,7 +76,8 @@ contract LicenseAttachmentIntegration is BaseIntegration {
assertEq(licenseTermsId, pilTemplate.getLicenseTermsId(commUseTerms));
}

function _test_LicenseAttachmentIntegration_mintAndRegisterIpAndAttachPILTerms() private
function _test_LicenseAttachmentIntegration_mintAndRegisterIpAndAttachPILTerms()
private
logTest("test_LicenseAttachmentIntegration_mintAndRegisterIpAndAttachPILTerms")
{
// IP 1
Expand Down Expand Up @@ -123,7 +125,8 @@ contract LicenseAttachmentIntegration is BaseIntegration {
}
}

function _test_LicenseAttachmentIntegration_registerIpAndAttachPILTerms() private
function _test_LicenseAttachmentIntegration_registerIpAndAttachPILTerms()
private
logTest("test_LicenseAttachmentIntegration_registerIpAndAttachPILTerms")
{
StoryUSD.mint(testSender, testMintFee);
Expand Down
9 changes: 6 additions & 3 deletions test/integration/workflows/RegistrationIntegration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ contract RegistrationIntegration is BaseIntegration {
assertTrue(spgNftContract.publicMinting());
}

function _test_RegistrationIntegration_mintAndRegisterIp() private
function _test_RegistrationIntegration_mintAndRegisterIp()
private
logTest("test_RegistrationIntegration_mintAndRegisterIp")
{
StoryUSD.mint(testSender, testMintFee);
Expand Down Expand Up @@ -121,7 +122,8 @@ contract RegistrationIntegration is BaseIntegration {
assertMetadata(actualIpId, testIpMetadata);
}

function _test_RegistrationIntegration_multicall_createCollection() private
function _test_RegistrationIntegration_multicall_createCollection()
private
logTest("test_RegistrationIntegration_multicall_createCollection")
{
uint256 totalCollections = 10;
Expand Down Expand Up @@ -164,7 +166,8 @@ contract RegistrationIntegration is BaseIntegration {
}
}

function _test_RegistrationIntegration_multicall_mintAndRegisterIp() private
function _test_RegistrationIntegration_multicall_mintAndRegisterIp()
private
logTest("test_RegistrationIntegration_multicall_mintAndRegisterIp")
{
uint256 totalIps = 10;
Expand Down
12 changes: 8 additions & 4 deletions test/integration/workflows/RoyaltyIntegration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ contract RoyaltyIntegration is BaseIntegration {
_endBroadcast();
}

function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimByTokenBatch() private
function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimByTokenBatch()
private
logTest("test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimByTokenBatch")
{
// setup IP graph with no snapshot
Expand Down Expand Up @@ -125,7 +126,8 @@ contract RoyaltyIntegration is BaseIntegration {
);
}

function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimBySnapshotBatch() private
function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimBySnapshotBatch()
private
logTest("test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimBySnapshotBatch")
{
// setup IP graph and takes 3 snapshots of ancestor IP's royalty vault
Expand Down Expand Up @@ -192,7 +194,8 @@ contract RoyaltyIntegration is BaseIntegration {
);
}

function _test_RoyaltyIntegration_snapshotAndClaimByTokenBatch() private
function _test_RoyaltyIntegration_snapshotAndClaimByTokenBatch()
private
logTest("test_RoyaltyIntegration_snapshotAndClaimByTokenBatch")
{
// setup IP graph with no snapshot
Expand Down Expand Up @@ -222,7 +225,8 @@ contract RoyaltyIntegration is BaseIntegration {
);
}

function _test_RoyaltyIntegration_snapshotAndClaimBySnapshotBatch() private
function _test_RoyaltyIntegration_snapshotAndClaimBySnapshotBatch()
private
logTest("test_RoyaltyIntegration_snapshotAndClaimBySnapshotBatch")
{
// setup IP graph and takes 1 snapshot of ancestor IP's royalty vault
Expand Down
Loading