chore: fix pr comments

makerdao · Jun 28, 2023 · 3e68b9f · 3e68b9f
1 parent 0c138c3
commit 3e68b9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 32 deletions.
diff --git a/src/DssSpell.sol b/src/DssSpell.sol
@@ -84,7 +84,7 @@ contract DssSpellAction is DssAction {
     address internal constant RWA015_A_OUTPUT_CONDUIT    = 0x1a976926bF6105Ff6dA1F7b1667bBe825974961E;
 
     // -- RWA015 END --
-    
+
     // -- ChainLink Keeper Network addresses --
     address internal constant CHAINLINK_PAYMENT_ADAPTER  = 0xfB5e1D841BDA584Af789bDFABe3c6419140EC065;
     address internal constant CHAINLINK_TREASURY         = 0xaBAbd5e7d6d05672391aB2A914F57ce343D5CFA6;
@@ -109,7 +109,7 @@ contract DssSpellAction is DssAction {
     address internal constant BANDHAR_WALLET             = 0xE83B6a503A94a5b764CCF00667689B3a522ABc21;
 
     // -- DAI TRANSFERS --
-    address internal constant BLOCKTOWER_WALLET          = 0xc4dB894A11B1eACE4CDb794d0753A3cB7A633767;
+    address internal constant BLOCKTOWER_WALLET_2        = 0xc4dB894A11B1eACE4CDb794d0753A3cB7A633767;
 
     // Function from https://github.com/makerdao/spells-goerli/blob/7d783931a6799fe8278e416b5ac60d4bb9c20047/archive/2022-11-14-DssSpell/Goerli-DssSpell.sol#L59
     function _updateDoc(bytes32 ilk, string memory doc) internal {
@@ -137,8 +137,8 @@ contract DssSpellAction is DssAction {
         // Debt ceiling * [ (1 + RWA stability fee ) ^ (minimum deal duration in years) ] * liquidation ratio
         // As we have SF 0 for this deal, this should be equal to ilk DC
         RwaLiquidationLike(MIP21_LIQUIDATION_ORACLE).bump(
-                "RWA015-A",
-                 1_280 * MILLION * WAD
+            "RWA015-A",
+            1_280 * MILLION * WAD
         );
         DssExecLib.updateCollateralPrice("RWA015-A");
 
@@ -255,7 +255,7 @@ contract DssSpellAction is DssAction {
         // MIP: https://mips.makerdao.com/mips/details/MIP104#5-2-legal-recourse-asset-budget
 
         // BlockTower Legal Expenses - 133,466 DAI - 0xc4dB894A11B1eACE4CDb794d0753A3cB7A633767
-        DssExecLib.sendPaymentFromSurplusBuffer(BLOCKTOWER_WALLET, 133_466);
+        DssExecLib.sendPaymentFromSurplusBuffer(BLOCKTOWER_WALLET_2, 133_466);
 
         DssExecLib.setChangelogVersion("1.14.14");
     }

diff --git a/src/DssSpell.t.sol b/src/DssSpell.t.sol
@@ -1037,33 +1037,6 @@ contract DssSpellTest is DssSpellTestBase {
         assertEq(dai.balanceOf(address(rwa015AOutputConduit)), drawAmount - pushAmount, "RWA015-A: Dai not sent to destination after push()");
     }
 
-    function testFailRWA015_A_OUTPUT_CONDUIT_PUSH_ABOVE_BALANCE() public {
-        _vote(address(spell));
-        _scheduleWaitAndCast(address(spell));
-        assertTrue(spell.done());
-
-        uint256 drawAmount = 2_500_000 * WAD;
-
-        // setting address(this) as operator
-        vm.store(address(rwa015AUrn), keccak256(abi.encode(address(this), uint256(1))), bytes32(uint256(1)));
-
-        // Draw line DAI
-        rwa015AUrn.draw(drawAmount);
-
-        // auth
-        GodMode.setWard(address(rwa015AOutputConduit), address(this), 1);
-
-        // pick address(this)
-        rwa015AOutputConduit.hope(address(this)); // allow this to call pick
-        rwa015AOutputConduit.kiss(address(this)); // allow this to be picked
-        rwa015AOutputConduit.pick(address(this));
-
-        // push above balance
-        uint256 pushAmount = drawAmount + 1 * WAD;
-        rwa015AOutputConduit.mate(address(this)); // allow this to call push
-        rwa015AOutputConduit.push(pushAmount);    // fail
-    }
-
     function test_RWA015_ORACLE_PRICE_BUMP() public {
         _vote(address(spell));
         _scheduleWaitAndCast(address(spell));