From c4e4020356ac87136097c8444194e985c901c18f Mon Sep 17 00:00:00 2001
From: Michael De Luca <35537333+deluca-mike@users.noreply.github.com>
Date: Fri, 26 Nov 2021 10:59:43 -0500
Subject: [PATCH] fix: take latest proxy-factory with migrator check fix (#11)

---
 contracts/test/MapleProxyFactory.t.sol | 10 +++++++---
 contracts/test/mocks/Mocks.sol         |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/contracts/test/MapleProxyFactory.t.sol b/contracts/test/MapleProxyFactory.t.sol
index 1cad6de..dea07fc 100644
--- 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,7 +101,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());
 
         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");
@@ -109,10 +109,14 @@ contract MapleProxyFactoryTests is TestUtils {
 
         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
index 0ff032c..cae5ff7 100644
--- 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 {}