Addressed review feedback from @jrhea

delvtech · Oct 9, 2024 · 2ad2a9f · 2ad2a9f
1 parent 105e5f4
commit 2ad2a9f
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 29 deletions.
diff --git a/codegen/templates/instances/Target4.sol.jinja b/codegen/templates/instances/Target4.sol.jinja
@@ -8,7 +8,7 @@ import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 
 /// @author DELV
 /// @title {{ name.capitalized }}Target4
-/// @notice {{ name.capitalized }}Hyperdrive's target3 logic contract. This contract contains
+/// @notice {{ name.capitalized }}Hyperdrive's target4 logic contract. This contract contains
 ///         several stateful functions that couldn't fit into the Hyperdrive
 ///         contract.
 /// @custom:disclaimer The language used in this code is for coding convenience

diff --git a/contracts/src/deployers/stk-well/StkWellTarget0Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget0Deployer.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.22;
 
 import { StkWellTarget0 } from "../../instances/stk-well/StkWellTarget0.sol";
-import { IStkWell } from "../../interfaces/IStkWell.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
 import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";

diff --git a/contracts/src/deployers/stk-well/StkWellTarget1Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget1Deployer.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.22;
 
 import { StkWellTarget1 } from "../../instances/stk-well/StkWellTarget1.sol";
-import { IStkWell } from "../../interfaces/IStkWell.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
 import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";

diff --git a/contracts/src/deployers/stk-well/StkWellTarget2Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget2Deployer.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.22;
 
 import { StkWellTarget2 } from "../../instances/stk-well/StkWellTarget2.sol";
-import { IStkWell } from "../../interfaces/IStkWell.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
 import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";

diff --git a/contracts/src/deployers/stk-well/StkWellTarget3Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget3Deployer.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.22;
 
 import { StkWellTarget3 } from "../../instances/stk-well/StkWellTarget3.sol";
-import { IStkWell } from "../../interfaces/IStkWell.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
 import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";

diff --git a/contracts/src/deployers/stk-well/StkWellTarget4Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget4Deployer.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.22;
 
 import { StkWellTarget4 } from "../../instances/stk-well/StkWellTarget4.sol";
-import { IStkWell } from "../../interfaces/IStkWell.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
 import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";

diff --git a/contracts/src/instances/corn/CornTarget4.sol b/contracts/src/instances/corn/CornTarget4.sol
@@ -9,7 +9,7 @@ import { CornBase } from "./CornBase.sol";
 
 /// @author DELV
 /// @title CornTarget4
-/// @notice CornHyperdrive's target3 logic contract. This contract contains
+/// @notice CornHyperdrive's target4 logic contract. This contract contains
 ///         several stateful functions that couldn't fit into the Hyperdrive
 ///         contract.
 /// @custom:disclaimer The language used in this code is for coding convenience

diff --git a/contracts/src/instances/rseth-linea/RsETHLineaTarget4.sol b/contracts/src/instances/rseth-linea/RsETHLineaTarget4.sol
@@ -9,7 +9,7 @@ import { RsETHLineaBase } from "./RsETHLineaBase.sol";
 
 /// @author DELV
 /// @title RsETHLineaTarget4
-/// @notice RsETHLineaHyperdrive's target3 logic contract. This contract contains
+/// @notice RsETHLineaHyperdrive's target4 logic contract. This contract contains
 ///         several stateful functions that couldn't fit into the Hyperdrive
 ///         contract.
 /// @custom:disclaimer The language used in this code is for coding convenience

diff --git a/contracts/src/instances/staking-usds/StakingUSDSTarget4.sol b/contracts/src/instances/staking-usds/StakingUSDSTarget4.sol
@@ -9,7 +9,7 @@ import { StakingUSDSBase } from "./StakingUSDSBase.sol";
 
 /// @author DELV
 /// @title StakingUSDSTarget4
-/// @notice StakingUSDSHyperdrive's target3 logic contract. This contract contains
+/// @notice StakingUSDSHyperdrive's target4 logic contract. This contract contains
 ///         several stateful functions that couldn't fit into the Hyperdrive
 ///         contract.
 /// @custom:disclaimer The language used in this code is for coding convenience

diff --git a/contracts/src/instances/stk-well/StkWellTarget4.sol b/contracts/src/instances/stk-well/StkWellTarget4.sol
@@ -8,7 +8,7 @@ import { StkWellBase } from "./StkWellBase.sol";
 
 /// @author DELV
 /// @title StkWellTarget4
-/// @notice StkWellHyperdrive's target3 logic contract. This contract contains
+/// @notice StkWellHyperdrive's target4 logic contract. This contract contains
 ///         several stateful functions that couldn't fit into the Hyperdrive
 ///         contract.
 /// @custom:disclaimer The language used in this code is for coding convenience

diff --git a/contracts/src/interfaces/IStkWell.sol b/contracts/src/interfaces/IStkWell.sol
diff --git a/test/utils/InstanceTest.sol b/test/utils/InstanceTest.sol
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-// FIXME
-import { console2 as console } from "forge-std/console2.sol";
-
 import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol";
 import { HyperdriveFactory } from "../../contracts/src/factory/HyperdriveFactory.sol";
 import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol";