From a80f7b7c117dd286d27a021b525a3837c60ff06b Mon Sep 17 00:00:00 2001 From: Arr00 <13561405+arr00@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:19:32 -0400 Subject: [PATCH] avoid duplicate testing --- test/crowdfund/InitialETHCrowdfund.t.sol | 6 +++--- test/party/PartyGovernanceNFT.t.sol | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/crowdfund/InitialETHCrowdfund.t.sol b/test/crowdfund/InitialETHCrowdfund.t.sol index c798291d..22c526a8 100644 --- a/test/crowdfund/InitialETHCrowdfund.t.sol +++ b/test/crowdfund/InitialETHCrowdfund.t.sol @@ -17,7 +17,7 @@ import "../../contracts/gatekeepers/AllowListGateKeeper.sol"; import "../TestUtils.sol"; -contract InitialETHCrowdfundBaseTest is Test, TestUtils, ERC721Receiver { +contract InitialETHCrowdfundTestBase is Test, TestUtils, ERC721Receiver { event Contributed( address indexed sender, address indexed contributor, @@ -133,7 +133,7 @@ contract InitialETHCrowdfundBaseTest is Test, TestUtils, ERC721Receiver { } } -contract InitialETHCrowdfundTest is InitialETHCrowdfundBaseTest { +contract InitialETHCrowdfundTest is InitialETHCrowdfundTestBase { function test_initialization_cannotReinitialize() public { InitialETHCrowdfund crowdfund = _createCrowdfund( CreateCrowdfundArgs({ @@ -1677,7 +1677,7 @@ contract InitialETHCrowdfundTest is InitialETHCrowdfundBaseTest { } } -contract InitialETHCrowdfundForkedTest is InitialETHCrowdfundBaseTest { +contract InitialETHCrowdfundForkedTest is InitialETHCrowdfundTestBase { function testForked_partyCardTokenURI_whileCrowdfundActive() public onlyForked { InitialETHCrowdfund crowdfund = _createCrowdfund( CreateCrowdfundArgs({ diff --git a/test/party/PartyGovernanceNFT.t.sol b/test/party/PartyGovernanceNFT.t.sol index 44e4b2f8..66c67eb6 100644 --- a/test/party/PartyGovernanceNFT.t.sol +++ b/test/party/PartyGovernanceNFT.t.sol @@ -20,7 +20,7 @@ import "../DummyERC721.sol"; import "../TestUsers.sol"; import "../TestUtils.sol"; -contract PartyGovernanceNFTTest is Test, TestUtils { +contract PartyGovernanceNFTTestBase is Test, TestUtils { Party partyImpl; PartyFactory partyFactory; DummySimpleProposalEngineImpl eng; @@ -90,7 +90,9 @@ contract PartyGovernanceNFTTest is Test, TestUtils { toadz = new DummyERC721(); toadz.mint(nftHolderAddress); } +} +contract PartyGovernanceNFTTest is PartyGovernanceNFTTestBase { function testMint() external { (Party party, , ) = partyAdmin.createParty( partyImpl, @@ -1611,7 +1613,7 @@ contract DummyParty is ReadOnlyDelegateCall { } } -contract PartyGovernanceNFTForkedTest is PartyGovernanceNFTTest { +contract PartyGovernanceNFTForkedTest is PartyGovernanceNFTTestBase { function testTokenURI_withFixedCrowdfundType() public onlyForked { // Create party DummyParty party = new DummyParty(address(globals), "Party of the Living Dead");