Minor changes

Author: sunbreak1211

deploy/FlapperInit.sol

@@ -60,7 +60,6 @@ interface SplitterLike {
     function usdsJoin() external view returns (address);
     function hop() external view returns (uint256);
     function rely(address) external;
-    function deny(address) external;
     function file(bytes32, uint256) external;
     function file(bytes32, address) external;
 }
@@ -72,15 +71,13 @@ interface FarmLike {
 }
 
 interface KickerLike {
+    function vat() external view returns (address);
+    function vow() external view returns (address);
+    function splitter() external view returns (address);
     function file(bytes32, uint256) external;
     function file(bytes32, int256) external;
 }
 
-interface VowLike {
-    function sump() external view returns (uint256);
-    function file(bytes32, uint256) external;
-}
-
 struct FlapperUniV2Config {
     uint256 want;
     address pip;
@@ -233,17 +230,21 @@ library FlapperInit {
     ) internal {
         require(cfg.kbump % RAY == 0,  "kbump not multiple of RAY");
 
-        VowLike vow = VowLike(dss.chainlog.getAddress("MCD_VOW"));
-        require(vow.sump() == type(uint256).max, "flop is not inactive");
+        address splitter = dss.chainlog.getAddress("MCD_SPLIT");
+        require(KickerLike(kicker).vat() == address(dss.vat), "vat missmatch");
+        require(KickerLike(kicker).vow() == address(dss.vow), "vow missmatch");
+        require(KickerLike(kicker).splitter() == splitter, "splitter missmatch");
+
+        require(dss.vow.sump() == type(uint256).max, "flop is not inactive");
 
-        vow.file("bump", 0);
-        vow.file("hump", type(uint256).max);
+        dss.vow.file("bump", 0);
+        dss.vow.file("hump", type(uint256).max);
 
         KickerLike(kicker).file("khump", cfg.khump);
         KickerLike(kicker).file("kbump", cfg.kbump);
 
         dss.vat.rely(kicker);
-        SplitterLike(dss.chainlog.getAddress("MCD_SPLIT")).rely(kicker);
+        SplitterLike(splitter).rely(kicker);
 
         dss.chainlog.setAddress(cfg.chainlogKey, kicker);
     }

src/Kicker.sol

@@ -31,8 +31,8 @@ contract Kicker {
     // --- storage variables ---
 
     mapping(address usr => uint256 allowed) public wards;
-    uint256 public kbump; // Fixed lot size  [rad]
-    int256  public khump; // Allowance limit [rad]
+    uint256 public kbump; // Fixed lot size [rad]
+    int256  public khump; // Flap threshold [rad]
 
     // --- immutables ---
 
@@ -102,7 +102,7 @@ contract Kicker {
     // --- execution ---
 
     function flap() external returns (uint256 id) {
-        require(_toInt256(vat.dai(vow)) >= _toInt256(vat.sin(vow)) + _toInt256(kbump) + khump, "Kicker/insufficient-allowance");
+        require(_toInt256(vat.dai(vow)) >= _toInt256(vat.sin(vow)) + _toInt256(kbump) + khump, "Kicker/flap-threshold-reached");
         vat.suck(vow, address(this), kbump);
         id = splitter.kick(kbump, 0);
     }

test/Kicker.t.sol

@@ -39,7 +39,6 @@ interface VowLike {
     function bump() external view returns (uint256);
     function hump() external view returns (uint256);
     function Sin() external view returns (uint256);
-    function Ash() external view returns (uint256);
     function heal(uint256) external;
     function flap() external;
     function cage() external;
@@ -363,7 +362,7 @@ contract KickerTest is DssTest {
         assertEq(vat.sin(address(vow)), 17_500e45);
         assertEq(vat.dai(address(vow)), 0);
 
-        vm.expectRevert("Kicker/insufficient-allowance");
+        vm.expectRevert("Kicker/flap-threshold-reached");
         kicker.flap();
     }