fix: take latest proxy-factory with migrator check fix (#11)

maple-labs · Nov 26, 2021 · c4e4020 · c4e4020
1 parent 78e187b
commit c4e4020
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/contracts/test/MapleProxyFactory.t.sol b/contracts/test/MapleProxyFactory.t.sol
@@ -7,7 +7,7 @@ import { MockInitializerV1, MockInitializerV2 } from "../../modules/proxy-factor
 import { Governor } from "./accounts/Governor.sol";
 import { User }     from "./accounts/User.sol";
 
-import { MapleGlobalsMock, MapleInstanceMock, EmptyContact } from "./mocks/Mocks.sol";
+import { MapleGlobalsMock, MapleInstanceMock, EmptyContract } from "./mocks/Mocks.sol";
 
 import { MapleProxyFactory } from "../MapleProxyFactory.sol";
 
@@ -101,18 +101,22 @@ contract MapleProxyFactoryTests is TestUtils {
         governor.mapleProxyFactory_registerImplementation(address(factory), 1, address(implementation1), address(initializerV1));
         governor.mapleProxyFactory_registerImplementation(address(factory), 2, address(implementation2), address(initializerV2));
 
-        address migrator = address(new EmptyContact());
+        address migrator = address(new EmptyContract());
 
         assertTrue(!notGovernor.try_mapleProxyFactory_enableUpgradePath(address(factory), 1, 2, migrator), "Should fail: not governor");
         assertTrue(   !governor.try_mapleProxyFactory_enableUpgradePath(address(factory), 1, 1, migrator), "Should fail: overwriting initializer");
         assertTrue(    governor.try_mapleProxyFactory_enableUpgradePath(address(factory), 1, 2, migrator), "Should succeed: upgrade");
 
         assertEq(factory.migratorForPath(1, 2), migrator, "Incorrect migrator");
 
+        migrator = address(new EmptyContract());
+
         assertTrue(governor.try_mapleProxyFactory_enableUpgradePath(address(factory), 2, 1, migrator), "Should succeed: downgrade");
 
         assertEq(factory.migratorForPath(2, 1), migrator, "Incorrect migrator");
 
+        migrator = address(new EmptyContract());
+
         assertTrue(governor.try_mapleProxyFactory_enableUpgradePath(address(factory), 1, 2, migrator), "Should succeed: change migrator");
 
         assertEq(factory.migratorForPath(1, 2), migrator, "Incorrect migrator");
@@ -122,7 +126,7 @@ contract MapleProxyFactoryTests is TestUtils {
         governor.mapleProxyFactory_registerImplementation(address(factory), 1, address(implementation1), address(initializerV1));
         governor.mapleProxyFactory_registerImplementation(address(factory), 2, address(implementation2), address(initializerV2));
 
-        address migrator = address(new EmptyContact());
+        address migrator = address(new EmptyContract());
 
         governor.mapleProxyFactory_enableUpgradePath(address(factory), 1, 2, migrator);
 

diff --git a/contracts/test/mocks/Mocks.sol b/contracts/test/mocks/Mocks.sol
@@ -40,4 +40,4 @@ contract MapleInstanceMock is IMapleProxied, MapleProxied {
 
 }
 
-contract EmptyContact {}
+contract EmptyContract {}