chore: remove flip_fab & flipper_mom from addresses

makerdao · Aug 28, 2023 · 8c7a148 · 8c7a148
1 parent 6c3aa33
commit 8c7a148
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/DssSpell.t.base.sol b/src/DssSpell.t.base.sol
@@ -185,7 +185,6 @@ contract DssSpellTestBase is Config, DssTest {
     CropperLike                  cropper = CropperLike(        addr.addr("MCD_CROPPER"));
 
     OsmMomAbstract                osmMom = OsmMomAbstract(     addr.addr("OSM_MOM"));
-    FlipperMomAbstract           flipMom = FlipperMomAbstract( addr.addr("FLIPPER_MOM"));
     ClipperMomAbstract           clipMom = ClipperMomAbstract( addr.addr("CLIPPER_MOM"));
     FlapperMomAbstract           flapMom = FlapperMomAbstract( addr.addr("FLAPPER_MOM"));
     AuthorityLike                 d3mMom = AuthorityLike(      addr.addr("DIRECT_MOM"));
@@ -465,9 +464,6 @@ contract DssSpellTestBase is Config, DssTest {
         // check OsmMom authority
         assertEq(osmMom.authority(), values.osm_mom_authority, "TestError/osmMom-authority");
 
-        // check FlipperMom authority
-        assertEq(flipMom.authority(), values.flipper_mom_authority, "TestError/flipperMom-authority");
-
         // check ClipperMom authority
         assertEq(clipMom.authority(), values.clipper_mom_authority, "TestError/clipperMom-authority");
 
@@ -591,8 +587,6 @@ contract DssSpellTestBase is Config, DssTest {
                 assertEq(uint256(flip.tau()), values.collaterals[ilk].flip_tau, _concat("TestError/flip-tau-", ilk));
                 assertTrue(flip.tau() >= 600 && flip.tau() <= 3 days, _concat("TestError/flip-tau-range-", ilk));          // gt eq 10 minutes and lt eq 3 days
 
-                assertEq(flip.wards(address(flipMom)), values.collaterals[ilk].flipper_mom, _concat("TestError/flip-flipperMom-auth-", ilk));
-
                 assertEq(flip.wards(address(cat)), values.collaterals[ilk].liqOn ? 1 : 0, _concat("TestError/flip-liqOn-", ilk));
                 assertEq(flip.wards(address(end)), 1, _concat("TestError/flip-end-auth-", ilk));
                 assertEq(flip.wards(address(pauseProxy)), 1, _concat("TestError/flip-pause-proxy-auth-", ilk)); // Check pause_proxy ward

diff --git a/src/DssSpell.t.sol b/src/DssSpell.t.sol
@@ -929,7 +929,9 @@ contract DssSpellTest is DssSpellTestBase {
         assertEq(vow.wards(address(esm)), 1, "VOW/ward-esm-not-set");
     }
 
-    function testFlliperMomDeauth() public {
+    function testFlipperMomDeauth() public {
+        FlipperMomAbstract flipMom = FlipperMomAbstract(chainLog.getAddress("FLIPPER_MOM"));
+
         _vote(address(spell));
         _scheduleWaitAndCast(address(spell));
         assertTrue(spell.done());

diff --git a/src/test/addresses_mainnet.sol b/src/test/addresses_mainnet.sol
@@ -26,7 +26,6 @@ contract Addresses {
         addr["FAUCET"]                          = 0x0000000000000000000000000000000000000000;
         addr["MCD_DEPLOY"]                      = 0xbaa65281c2FA2baAcb2cb550BA051525A480D3F4;
         addr["JOIN_FAB"]                        = 0xf1738d22140783707Ca71CB3746e0dc7Bf2b0264;
-        addr["FLIP_FAB"]                        = 0x4ACdbe9dd0d00b36eC2050E805012b8Fc9974f2b;
         addr["CLIP_FAB"]                        = 0x0716F25fBaAae9b63803917b6125c10c313dF663;
         addr["CALC_FAB"]                        = 0xE1820A2780193d74939CcA104087CADd6c1aA13A;
         addr["LERP_FAB"]                        = 0x9175561733D138326FDeA86CdFdF53e92b588276;
@@ -61,7 +60,6 @@ contract Addresses {
         addr["GET_CDPS"]                        = 0x36a724Bd100c39f0Ea4D3A20F7097eE01A8Ff573;
         addr["ILK_REGISTRY"]                    = 0x5a464C28D19848f44199D003BeF5ecc87d090F87;
         addr["OSM_MOM"]                         = 0x76416A4d5190d071bfed309861527431304aA14f;
-        addr["FLIPPER_MOM"]                     = 0xc4bE7F74Ee3743bDEd8E0fA218ee5cf06397f472;
         addr["CLIPPER_MOM"]                     = 0x79FBDF16b366DFb14F66cE4Ac2815Ca7296405A0;
         addr["LINE_MOM"]                        = 0x9c257e5Aaf73d964aEBc2140CA38078988fB0C10;
         addr["PROXY_FACTORY"]                   = 0xA26e15C895EFc0616177B7c1e7270A4C7D51C997;

diff --git a/src/test/config.sol b/src/test/config.sol
@@ -124,11 +124,10 @@ contract Config {
         afterSpell.cat_box =               20 * MILLION;            // In whole Dai units
         afterSpell.dog_Hole =              70 * MILLION;            // In whole Dai units
         afterSpell.esm_min =               150 * THOUSAND;          // In whole MKR units
-        afterSpell.pause_authority =       chief;                 // Pause authority
-        afterSpell.osm_mom_authority =     chief;                 // OsmMom authority
-        afterSpell.flipper_mom_authority = address(0);              // FlipperMom authority
-        afterSpell.clipper_mom_authority = chief;                 // ClipperMom authority
-        afterSpell.d3m_mom_authority =     chief;                 // D3MMom authority
+        afterSpell.pause_authority =       chief;                   // Pause authority
+        afterSpell.osm_mom_authority =     chief;                   // OsmMom authority
+        afterSpell.clipper_mom_authority = chief;                   // ClipperMom authority
+        afterSpell.d3m_mom_authority =     chief;                   // D3MMom authority
         afterSpell.ilk_count =             64;                      // Num expected in system
         afterSpell.chainlog_version =      "1.16.0";                // String expected in system