testing fixes (#5)

* tmp

* portfolio and 4626 fixes/tests

* fix rebase issues

* update existing tests, remove position tests (will re-add similar scope with idle liquidity feature)

* Update test/units/EverlongPortfolio.t.sol

Co-authored-by: Alex Towle <jalextowle@gmail.com>

* Update contracts/Everlong.sol

Co-authored-by: Alex Towle <jalextowle@gmail.com>

---------

Co-authored-by: Alex Towle <jalextowle@gmail.com>

contracts/Everlong.sol

@@ -215,6 +215,13 @@ contract Everlong is IEverlong {
             );
     }
 
+    /// @dev Rebalance after a deposit if needed.
+    function _afterDeposit(uint256, uint256) internal virtual override {
+        if (canRebalance()) {
+            rebalance();
+        }
+    }
+
     /// @dev Frees sufficient assets for a withdrawal by closing positions.
     /// @param assets Amount of assets owed to the withdrawer.
     function _beforeWithdraw(
@@ -246,6 +253,14 @@ contract Everlong is IEverlong {
         _portfolio.handleOpenPosition(maturityTime, bondAmount);
     }
 
+    // FIXME: Consider idle liquidity + maybe maxLong?
+    //
+    /// @notice Returns whether the portfolio needs rebalancing.
+    /// @return True if the portfolio needs rebalancing, false otherwise.
+    function canRebalance() public view returns (bool) {
+        return true;
+    }
+
     // ╭─────────────────────────────────────────────────────────╮
     // │ Hyperdrive                                              │
     // ╰─────────────────────────────────────────────────────────╯
@@ -310,21 +325,18 @@ contract Everlong is IEverlong {
         return _decimals;
     }
 
-    /// @notice Returns the address of the token used to interact with the Hyperdrive
-    ///         instance.
+    /// @dev The decimal offset used for virtual shares.
+    /// @return The decimal offset used for virtual shares.
+    function _decimalsOffset() internal view virtual override returns (uint8) {
+        return decimalsOffset;
+    }
+
+    /// @notice Address of the token used to interact with the Hyperdrive instance.
     /// @return Address of the token used to interact with the Hyperdrive instance.
     function asset() public view override returns (address) {
         return address(_asset);
     }
 
-    // FIXME: Consider idle liquidity + maybe maxLong?
-    //
-    /// @notice Returns whether the portfolio needs rebalancing.
-    /// @return True if the portfolio needs rebalancing, false otherwise.
-    function canRebalance() external view returns (bool) {
-        return IHyperdrive(hyperdrive).isMature(_portfolio.head());
-    }
-
     /// @notice Returns whether the portfolio has matured positions.
     /// @return True if the portfolio has matured positions, false otherwise.
     function hasMaturedPositions() external view returns (bool) {

contracts/libraries/HyperdriveExecution.sol

@@ -128,8 +128,8 @@ library HyperdriveExecutionLibrary {
             poolConfig.timeStretch
         );
         bondReservesDelta = _calculateOpenLongFees(
-            bondReservesDelta,
             _shareAmount,
+            bondReservesDelta,
             _vaultSharePrice,
             spotPrice,
             poolConfig.fees.curve

test/integration/CloseImmatureLongs.t.sol

@@ -145,7 +145,6 @@ contract PricingTest is EverlongTest {
         ERC20Mintable(everlong.asset()).mint(basePaid);
         ERC20Mintable(everlong.asset()).approve(address(everlong), basePaid);
         uint256 shares = everlong.deposit(basePaid, bob);
-        everlong.rebalance();
 
         // half term passes
         advanceTimeWithCheckpoints(POSITION_DURATION / 2, variableInterest);

test/units/Everlong.t.sol

@@ -6,6 +6,11 @@ import { EverlongTest } from "../harnesses/EverlongTest.sol";
 
 /// @dev Tests Everlong functionality.
 contract TestEverlong is EverlongTest {
+    function setUp() public override {
+        super.setUp();
+        deployEverlong();
+    }
+
     /// @dev Ensure that the `hyperdrive()` view function is implemented.
     function test_hyperdrive() external view {
         assertEq(

test/units/EverlongAdmin.t.sol

@@ -8,6 +8,11 @@ import { IEverlong } from "../../contracts/interfaces/IEverlong.sol";
 
 /// @dev Tests Everlong Admin functionality.
 contract TestEverlongAdmin is EverlongTest {
+    function setUp() public override {
+        super.setUp();
+        deployEverlong();
+    }
+
     /// @dev Validates revert when `setAdmin` called by non-admin.
     function test_setAdmin_failure_unauthorized() external {
         // Ensure that an unauthorized user cannot set the admin address.