diff --git a/packages/1155-contracts/test/factory/ZoraCreator1155Factory_Fork.t.sol b/packages/1155-contracts/test/factory/ZoraCreator1155Factory_Fork.t.sol index e45761254..c331d0355 100644 --- a/packages/1155-contracts/test/factory/ZoraCreator1155Factory_Fork.t.sol +++ b/packages/1155-contracts/test/factory/ZoraCreator1155Factory_Fork.t.sol @@ -149,28 +149,4 @@ contract ZoraCreator1155FactoryForkTest is ForkDeploymentConfig, Test { testTheFork(forkTestChains[i]); } } - - // this is a temporary test to simulate the upgrade to the correct factory implementation - // on zora goerli. it can be deleted post upgrade - function test_fork_zoraGoerli_factoryUpgradeCanMint() external { - // create and select the fork, which will be used for all subsequent calls - // it will also affect the current block chain id based on the rpc url returned - vm.createSelectFork(vm.rpcUrl("zora_goerli")); - - Deployment memory deployment = getDeployment(); - - address factoryAddress = deployment.factoryProxy; - ZoraCreator1155FactoryImpl factory = ZoraCreator1155FactoryImpl(factoryAddress); - - vm.prank(factory.owner()); - - factory.upgradeTo(deployment.factoryImpl); - - // sanity check - check minters match config - assertEq(address(factory.merkleMinter()), deployment.merkleMintSaleStrategy); - assertEq(address(factory.fixedPriceMinter()), deployment.fixedPriceSaleStrategy); - assertEq(address(factory.redeemMinterFactory()), deployment.redeemMinterFactory); - - mintTokenAtFork(factory); - } } diff --git a/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol b/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol index d5c3bf87a..71a8fe1fd 100644 --- a/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol +++ b/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol @@ -292,40 +292,6 @@ contract ZoraCreator1155PreminterTest is ForkDeploymentConfig, Test { } } - // this is a temporary test to simulate the upcoming upgrade - function test_fork_zoraGoerli_afterUpgradeCanPremint() external { - vm.createSelectFork(vm.rpcUrl("zora_goerli")); - - Deployment memory deployment = getDeployment(); - - factory = ZoraCreator1155FactoryImpl(deployment.factoryProxy); - - console2.log("factory upgrade target:", deployment.factoryProxy); - bytes memory factoryProxyUpgradeCall = abi.encodeWithSelector(UUPSUpgradeable.upgradeTo.selector, deployment.factoryImpl); - console2.log("factory upgrade call:", vm.toString(factoryProxyUpgradeCall)); - - console2.log("preminter upgrade target:", deployment.preminterProxy); - bytes memory preminterProxyUpgradeCall = abi.encodeWithSelector(UUPSUpgradeable.upgradeTo.selector, deployment.preminterImpl); - console2.log("preminter upgrade call:", vm.toString(preminterProxyUpgradeCall)); - - vm.prank(factory.owner()); - // lets call it as if we were calling from a safe: - deployment.factoryProxy.call(factoryProxyUpgradeCall); - - // override test storage to point to proxy - preminter = ZoraCreator1155PremintExecutorImpl(deployment.preminterProxy); - - vm.prank(preminter.owner()); - // preminter impl was already created with correct factory, were just upgrading it now - deployment.preminterProxy.call(preminterProxyUpgradeCall); - - assertEq(address(preminter.zora1155Factory()), address(factory)); - - preminterCanMintTokens(); - - // lets console.log these upgrades - } - function test_signatureForSameContractandUid_shouldMintExistingToken() external { // 1. Make contract creation params