fix(test): use new pre-deployed create3 and TestProxyHelper

storyprotocol · Jan 5, 2025 · 984abde · 984abde
1 parent 2141b1e
commit 984abde
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 30 deletions.
diff --git a/test/integration/BaseIntegration.t.sol b/test/integration/BaseIntegration.t.sol
@@ -58,7 +58,7 @@ contract BaseIntegration is Test, Script, StoryProtocolCoreAddressManager, Story
     RoyaltyWorkflows internal royaltyWorkflows;
 
     /// @dev Story USD
-    SUSD internal StoryUSD = SUSD(0x6058bB8A2a51a8e63Bd18cE897D08616331C25a7);
+    SUSD internal StoryUSD = SUSD(0x48D80f8b87F7f1B6f2fBF3A7C45Eb7De6C8374F9);
 
     /// @dev Test data
     string internal testCollectionName;

diff --git a/test/story-nft/OrgNFT.t.sol b/test/story-nft/OrgNFT.t.sol
@@ -4,14 +4,14 @@ pragma solidity 0.8.26;
 // external
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
+import { TestProxyHelper } from "@storyprotocol/test/utils/TestProxyHelper.sol";
 
 // contracts
 import { IOrgNFT } from "../../contracts/interfaces/story-nft/IOrgNFT.sol";
 import { OrgNFT } from "../../contracts/story-nft/OrgNFT.sol";
 
 // test
 import { BaseTest } from "../utils/BaseTest.t.sol";
-import { TestProxyHelper } from "../utils/TestProxyHelper.t.sol";
 
 contract OrgNFTTest is BaseTest {
     function setUp() public override {

diff --git a/test/story-nft/OrgStoryNFTFactory.t.sol b/test/story-nft/OrgStoryNFTFactory.t.sol
@@ -5,6 +5,7 @@ pragma solidity 0.8.26;
 import { IAccessManaged } from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 import { IIPAccount } from "@storyprotocol/core/interfaces/IIPAccount.sol";
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+import { TestProxyHelper } from "@storyprotocol/test/utils/TestProxyHelper.sol";
 
 // contracts
 import { IOrgNFT } from "../../contracts/interfaces/story-nft/IOrgNFT.sol";
@@ -15,7 +16,6 @@ import { OrgStoryNFTFactory } from "../../contracts/story-nft/OrgStoryNFTFactory
 
 // test
 import { BaseTest } from "../utils/BaseTest.t.sol";
-import { TestProxyHelper } from "../utils/TestProxyHelper.t.sol";
 
 contract OrgStoryNFTFactoryTest is BaseTest {
     string private orgName;

diff --git a/test/story-nft/StoryBadgeNFT.t.sol b/test/story-nft/StoryBadgeNFT.t.sol
@@ -6,6 +6,7 @@ import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import { IIPAccount } from "@storyprotocol/core/interfaces/IIPAccount.sol";
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+import { TestProxyHelper } from "@storyprotocol/test/utils/TestProxyHelper.sol";
 
 // contracts
 import { BaseStoryNFT } from "../../contracts/story-nft/BaseStoryNFT.sol";
@@ -17,7 +18,6 @@ import { CachableNFT } from "../../contracts/story-nft/CachableNFT.sol";
 
 // test
 import { BaseTest } from "../utils/BaseTest.t.sol";
-import { TestProxyHelper } from "../utils/TestProxyHelper.t.sol";
 
 contract StoryBadgeNFTTest is BaseTest {
     function setUp() public override {

diff --git a/test/utils/BaseTest.t.sol b/test/utils/BaseTest.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.26;
 
 // external
 import { Test } from "forge-std/Test.sol";
-import { Create3Deployer } from "@create3-deployer/contracts/Create3Deployer.sol";
+import { Create3Deployer } from "@storyprotocol/script/utils/Create3Deployer.sol";
 import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import { AccessPermission } from "@storyprotocol/core/lib/AccessPermission.sol";
 import { IAccessController } from "@storyprotocol/core/interfaces/access/IAccessController.sol";

diff --git a/test/utils/TestProxyHelper.t.sol b/test/utils/TestProxyHelper.t.sol