Merge pull request #152 from moleculeprotocol/stefan/drop-permissione…

…r-setter

drops setPermissioner

foundry.toml

@@ -3,10 +3,25 @@ src = 'src'
 out = 'out'
 libs = ['lib']
 test = 'test'
-cache_path  = 'cache_forge'
+cache_path = 'cache_forge'
 solc_version = "0.8.18"
-gas_reports = ["IPNFT", "IPNFTV2", "SchmackoSwap", "Tokenizer", "IPToken", "CrowdSale", "LockingCrowdSale", "StakedLockingCrowdSale", "TimelockedToken", "TermsAcceptedPermissioner", "SignedMintAuthorizer"]
-fs_permissions = [{ access = "read-write", path = "./SALEID.txt"}]
+gas_reports = [
+  "IPNFT",
+  "IPNFTV2",
+  "SchmackoSwap",
+  "Tokenizer",
+  "IPToken",
+  "CrowdSale",
+  "LockingCrowdSale",
+  "StakedLockingCrowdSale",
+  "TimelockedToken",
+  "TermsAcceptedPermissioner",
+  "SignedMintAuthorizer",
+]
+fs_permissions = [
+  { access = "read-write", path = "./SALEID.txt" },
+  { access = "read", path = "./out" },
+]
 
 [fmt]
 bracket_spacing = true
@@ -18,5 +33,5 @@ override_spacing = false
 
 [rpc_endpoints]
 optimism = "https://optimism-goerli.infura.io/v3/${INFURA_KEY}"
-goerli   = "https://goerli.infura.io/v3/${INFURA_KEY}"
-mainnet  = "https://mainnet.infura.io/v3/${INFURA_KEY}" 
+goerli = "https://goerli.infura.io/v3/${INFURA_KEY}"
+mainnet = "https://mainnet.infura.io/v3/${INFURA_KEY}"

src/Tokenizer.sol

@@ -80,14 +80,6 @@ contract Tokenizer is UUPSUpgradeable, OwnableUpgradeable {
         ipTokenImplementation = _ipTokenImplementation;
     }
 
-    function setPermissioner(IPermissioner _permissioner) external onlyOwner {
-        if (address(_permissioner) == address(0)) {
-            revert ZeroAddress();
-        }
-        emit PermissionerUpdated(permissioner, _permissioner);
-        permissioner = _permissioner;
-    }
-
     /**
      * @dev called after an upgrade to reinitialize a new permissioner impl.
      * @param _permissioner the new TermsPermissioner

test/Forking/TokenizerFork.t.sol

@@ -16,7 +16,7 @@ import { IPermissioner, BlindPermissioner } from "../../src/Permissioner.sol";
 
 //import { SchmackoSwap, ListingState } from "../../src/SchmackoSwap.sol";
 
-contract TokenizerTest is Test {
+contract TokenizerForkTest is Test {
     using SafeERC20Upgradeable for IPToken;
 
     uint256 mainnetFork;
@@ -69,8 +69,7 @@ contract TokenizerTest is Test {
 
         assertEq(address(upgradedTokenizer.ipTokenImplementation()), address(newIPTokenImplementation));
 
-        upgradedTokenizer.setPermissioner(new BlindPermissioner());
-
+        deployCodeTo("Permissioner.sol:BlindPermissioner", "", address(upgradedTokenizer.permissioner()));
         vm.stopPrank();
 
         assertEq(ipnftMainnetInstance.ownerOf(valleyDaoIpnftId), valleyDaoMultisig);

test/Tokenizer.t.sol

@@ -17,7 +17,7 @@ import { IPNFT } from "../src/IPNFT.sol";
 import { AcceptAllAuthorizer } from "./helpers/AcceptAllAuthorizer.sol";
 
 import { FakeERC20 } from "../src/helpers/FakeERC20.sol";
-import { MustOwnIpnft, AlreadyTokenized, Tokenizer } from "../src/Tokenizer.sol";
+import { MustOwnIpnft, AlreadyTokenized, Tokenizer, ZeroAddress } from "../src/Tokenizer.sol";
 
 import { IPToken, OnlyIssuerOrOwner, TokenCapped } from "../src/IPToken.sol";
 import { Molecules } from "../src/helpers/test-upgrades/Molecules.sol";
@@ -82,30 +82,18 @@ contract TokenizerTest is Test {
         vm.stopPrank();
     }
 
-    function testSetPermissioner() public {
-        vm.startPrank(deployer);
-        assertEq(address(tokenizer.permissioner()), address(blindPermissioner));
-        BlindPermissioner newPermissioner = new BlindPermissioner();
-        tokenizer.setPermissioner(newPermissioner);
-        assertEq(address(tokenizer.permissioner()), address(newPermissioner)); 
-        vm.expectRevert();
-        tokenizer.setPermissioner(IPermissioner(address(0)));
-        vm.stopPrank();
-        vm.startPrank(originalOwner);
-        vm.expectRevert();
-        tokenizer.setPermissioner(newPermissioner);
-        vm.stopPrank();
-    }
     function testSetIPTokenImplementation() public {
         vm.startPrank(deployer);
         IPToken newIPTokenImplementation = new IPToken();
         tokenizer.setIPTokenImplementation(newIPTokenImplementation);
-        assertEq(address(tokenizer.ipTokenImplementation()), address(newIPTokenImplementation)); 
-        vm.expectRevert();
+        assertEq(address(tokenizer.ipTokenImplementation()), address(newIPTokenImplementation));
+
+        vm.expectRevert(ZeroAddress.selector);
         tokenizer.setIPTokenImplementation(IPToken(address(0)));
         vm.stopPrank();
+
         vm.startPrank(originalOwner);
-        vm.expectRevert();
+        vm.expectRevert("Ownable: caller is not the owner");
         tokenizer.setIPTokenImplementation(newIPTokenImplementation);
         vm.stopPrank();
     }