Skip to content

Commit d7a4f19

Browse files
authored
fix(upgrade script): add missing super.run() in upgrade scripts (#81)
* fix(upgrade-script): add missing `super.run()` * chore(integ-test): linting
1 parent 28176d9 commit d7a4f19

11 files changed

+45
-21
lines changed

script/upgrade/UpgradeDerivativeWorkflows.s.sol

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ contract UpgradeDerivativeWorkflows is UpgradeHelper {
1919
///
2020
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
2121
function run() public override {
22+
super.run();
2223
_beginBroadcast();
2324
_deployDerivativeWorkflows();
2425

script/upgrade/UpgradeGroupingWorkflows.s.sol

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ contract UpgradeGroupingWorkflows is UpgradeHelper {
1919
///
2020
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
2121
function run() public override {
22+
super.run();
2223
_beginBroadcast();
2324
_deployGroupingWorkflows();
2425

script/upgrade/UpgradeLicenseAttachmentWorkflows.s.sol

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ contract UpgradeLicenseAttachmentWorkflows is UpgradeHelper {
1919
///
2020
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
2121
function run() public override {
22+
super.run();
2223
_beginBroadcast();
2324
_deployLicenseAttachmentWorkflows();
2425

script/upgrade/UpgradeRegistrationWorkflows.s.sol

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ contract UpgradeRegistrationWorkflows is UpgradeHelper {
1919
///
2020
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
2121
function run() public override {
22+
super.run();
2223
_beginBroadcast();
2324
_deployRegistrationWorkflows();
2425

script/upgrade/UpgradeRoyaltyWorkflows.s.sol

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ contract UpgradeRoyaltyWorkflows is UpgradeHelper {
1919
///
2020
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
2121
function run() public override {
22+
super.run();
2223
_beginBroadcast();
2324
_deployRoyaltyWorkflows();
2425

script/upgrade/UpgradeSPGNFT.s.sol

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ contract UpgradeSPGNFT is UpgradeHelper {
2020
/// For detailed examples, see the documentation in `../../docs/DEPLOY_UPGRADE.md`.
2121
function run() public override {
2222
super.run();
23-
2423
_beginBroadcast();
2524
_deploySPGNFT();
2625

test/integration/workflows/DerivativeIntegration.t.sol

+10-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ contract DerivativeIntegration is BaseIntegration {
3838
_endBroadcast();
3939
}
4040

41-
function _test_mintAndRegisterIpAndMakeDerivative() private
41+
function _test_mintAndRegisterIpAndMakeDerivative()
42+
private
4243
logTest("test_DerivativeIntegration_mintAndRegisterIpAndMakeDerivative")
4344
{
4445
StoryUSD.mint(testSender, testMintFee * 2);
@@ -75,7 +76,8 @@ contract DerivativeIntegration is BaseIntegration {
7576
});
7677
}
7778

78-
function _test_registerIpAndMakeDerivative() private
79+
function _test_registerIpAndMakeDerivative()
80+
private
7981
logTest("test_DerivativeIntegration_registerIpAndMakeDerivative")
8082
{
8183
StoryUSD.mint(testSender, testMintFee);
@@ -149,7 +151,8 @@ contract DerivativeIntegration is BaseIntegration {
149151
});
150152
}
151153

152-
function _test_mintAndRegisterIpAndMakeDerivativeWithLicenseTokens() private
154+
function _test_mintAndRegisterIpAndMakeDerivativeWithLicenseTokens()
155+
private
153156
logTest("test_DerivativeIntegration_mintAndRegisterIpAndMakeDerivativeWithLicenseTokens")
154157
{
155158
StoryUSD.mint(testSender, testMintFee);
@@ -200,7 +203,8 @@ contract DerivativeIntegration is BaseIntegration {
200203
});
201204
}
202205

203-
function _test_registerIpAndMakeDerivativeWithLicenseTokens() private
206+
function _test_registerIpAndMakeDerivativeWithLicenseTokens()
207+
private
204208
logTest("test_DerivativeIntegration_registerIpAndMakeDerivativeWithLicenseTokens")
205209
{
206210
StoryUSD.mint(testSender, testMintFee);
@@ -281,7 +285,8 @@ contract DerivativeIntegration is BaseIntegration {
281285
});
282286
}
283287

284-
function _test_multicall_mintAndRegisterIpAndMakeDerivative() private
288+
function _test_multicall_mintAndRegisterIpAndMakeDerivative()
289+
private
285290
logTest("test_DerivativeIntegration_multicall_mintAndRegisterIpAndMakeDerivative")
286291
{
287292
uint256 numCalls = 10;

test/integration/workflows/GroupingIntegration.t.sol

+10-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ contract GroupingIntegration is BaseIntegration {
4040
_endBroadcast();
4141
}
4242

43-
function _test_GroupingIntegration_mintAndRegisterIpAndAttachLicenseAndAddToGroup() private
43+
function _test_GroupingIntegration_mintAndRegisterIpAndAttachLicenseAndAddToGroup()
44+
private
4445
logTest("test_GroupingIntegration_mintAndRegisterIpAndAttachLicenseAndAddToGroup")
4546
{
4647
uint256 deadline = block.timestamp + 1000;
@@ -83,7 +84,8 @@ contract GroupingIntegration is BaseIntegration {
8384
assertEq(licenseTermsId, testLicenseTermsId);
8485
}
8586

86-
function _test_GroupingIntegration_registerIpAndAttachLicenseAndAddToGroup() private
87+
function _test_GroupingIntegration_registerIpAndAttachLicenseAndAddToGroup()
88+
private
8789
logTest("test_GroupingIntegration_registerIpAndAttachLicenseAndAddToGroup")
8890
{
8991
StoryUSD.mint(testSender, testMintFee);
@@ -145,7 +147,8 @@ contract GroupingIntegration is BaseIntegration {
145147
assertEq(licenseTermsId, testLicenseTermsId);
146148
}
147149

148-
function _test_GroupingIntegration_registerGroupAndAttachLicenseAndAddIps() private
150+
function _test_GroupingIntegration_registerGroupAndAttachLicenseAndAddIps()
151+
private
149152
logTest("test_GroupingIntegration_registerGroupAndAttachLicenseAndAddIps")
150153
{
151154
address newGroupId = groupingWorkflows.registerGroupAndAttachLicenseAndAddIps({
@@ -170,7 +173,8 @@ contract GroupingIntegration is BaseIntegration {
170173
assertEq(licenseTermsId, testLicenseTermsId);
171174
}
172175

173-
function _test_GroupingIntegration_multicall_mintAndRegisterIpAndAttachLicenseAndAddToGroup() private
176+
function _test_GroupingIntegration_multicall_mintAndRegisterIpAndAttachLicenseAndAddToGroup()
177+
private
174178
logTest("test_GroupingIntegration_multicall_mintAndRegisterIpAndAttachLicenseAndAddToGroup")
175179
{
176180
uint256 deadline = block.timestamp + 1000;
@@ -227,7 +231,8 @@ contract GroupingIntegration is BaseIntegration {
227231
}
228232
}
229233

230-
function _test_GroupingIntegration_multicall_registerIpAndAttachLicenseAndAddToGroup() private
234+
function _test_GroupingIntegration_multicall_registerIpAndAttachLicenseAndAddToGroup()
235+
private
231236
logTest("test_GroupingIntegration_multicall_registerIpAndAttachLicenseAndAddToGroup")
232237
{
233238
uint256 numCalls = 10;

test/integration/workflows/LicenseAttachmentIntegration.t.sol

+6-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ contract LicenseAttachmentIntegration is BaseIntegration {
3535
_endBroadcast();
3636
}
3737

38-
function _test_LicenseAttachmentIntegration_registerPILTermsAndAttach() private
38+
function _test_LicenseAttachmentIntegration_registerPILTermsAndAttach()
39+
private
3940
logTest("test_LicenseAttachmentIntegration_registerPILTermsAndAttach")
4041
{
4142
StoryUSD.mint(testSender, testMintFee);
@@ -75,7 +76,8 @@ contract LicenseAttachmentIntegration is BaseIntegration {
7576
assertEq(licenseTermsId, pilTemplate.getLicenseTermsId(commUseTerms));
7677
}
7778

78-
function _test_LicenseAttachmentIntegration_mintAndRegisterIpAndAttachPILTerms() private
79+
function _test_LicenseAttachmentIntegration_mintAndRegisterIpAndAttachPILTerms()
80+
private
7981
logTest("test_LicenseAttachmentIntegration_mintAndRegisterIpAndAttachPILTerms")
8082
{
8183
// IP 1
@@ -123,7 +125,8 @@ contract LicenseAttachmentIntegration is BaseIntegration {
123125
}
124126
}
125127

126-
function _test_LicenseAttachmentIntegration_registerIpAndAttachPILTerms() private
128+
function _test_LicenseAttachmentIntegration_registerIpAndAttachPILTerms()
129+
private
127130
logTest("test_LicenseAttachmentIntegration_registerIpAndAttachPILTerms")
128131
{
129132
StoryUSD.mint(testSender, testMintFee);

test/integration/workflows/RegistrationIntegration.t.sol

+6-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ contract RegistrationIntegration is BaseIntegration {
6868
assertTrue(spgNftContract.publicMinting());
6969
}
7070

71-
function _test_RegistrationIntegration_mintAndRegisterIp() private
71+
function _test_RegistrationIntegration_mintAndRegisterIp()
72+
private
7273
logTest("test_RegistrationIntegration_mintAndRegisterIp")
7374
{
7475
StoryUSD.mint(testSender, testMintFee);
@@ -121,7 +122,8 @@ contract RegistrationIntegration is BaseIntegration {
121122
assertMetadata(actualIpId, testIpMetadata);
122123
}
123124

124-
function _test_RegistrationIntegration_multicall_createCollection() private
125+
function _test_RegistrationIntegration_multicall_createCollection()
126+
private
125127
logTest("test_RegistrationIntegration_multicall_createCollection")
126128
{
127129
uint256 totalCollections = 10;
@@ -164,7 +166,8 @@ contract RegistrationIntegration is BaseIntegration {
164166
}
165167
}
166168

167-
function _test_RegistrationIntegration_multicall_mintAndRegisterIp() private
169+
function _test_RegistrationIntegration_multicall_mintAndRegisterIp()
170+
private
168171
logTest("test_RegistrationIntegration_multicall_mintAndRegisterIp")
169172
{
170173
uint256 totalIps = 10;

test/integration/workflows/RoyaltyIntegration.t.sol

+8-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ contract RoyaltyIntegration is BaseIntegration {
5959
_endBroadcast();
6060
}
6161

62-
function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimByTokenBatch() private
62+
function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimByTokenBatch()
63+
private
6364
logTest("test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimByTokenBatch")
6465
{
6566
// setup IP graph with no snapshot
@@ -125,7 +126,8 @@ contract RoyaltyIntegration is BaseIntegration {
125126
);
126127
}
127128

128-
function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimBySnapshotBatch() private
129+
function _test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimBySnapshotBatch()
130+
private
129131
logTest("test_RoyaltyIntegration_transferToVaultAndSnapshotAndClaimBySnapshotBatch")
130132
{
131133
// setup IP graph and takes 3 snapshots of ancestor IP's royalty vault
@@ -192,7 +194,8 @@ contract RoyaltyIntegration is BaseIntegration {
192194
);
193195
}
194196

195-
function _test_RoyaltyIntegration_snapshotAndClaimByTokenBatch() private
197+
function _test_RoyaltyIntegration_snapshotAndClaimByTokenBatch()
198+
private
196199
logTest("test_RoyaltyIntegration_snapshotAndClaimByTokenBatch")
197200
{
198201
// setup IP graph with no snapshot
@@ -222,7 +225,8 @@ contract RoyaltyIntegration is BaseIntegration {
222225
);
223226
}
224227

225-
function _test_RoyaltyIntegration_snapshotAndClaimBySnapshotBatch() private
228+
function _test_RoyaltyIntegration_snapshotAndClaimBySnapshotBatch()
229+
private
226230
logTest("test_RoyaltyIntegration_snapshotAndClaimBySnapshotBatch")
227231
{
228232
// setup IP graph and takes 1 snapshot of ancestor IP's royalty vault

0 commit comments

Comments
 (0)