update Checkpoint, remove dead code

crates/hyperdrive-math/src/long/open.rs

@@ -124,7 +124,7 @@ impl State {
 mod tests {
     use ethers::{signers::LocalWallet, types::U256};
     use fixed_point_macros::{fixed, uint256};
-    use hyperdrive_wrappers::wrappers::ihyperdrive::{Checkpoint, Options};
+    use hyperdrive_wrappers::wrappers::ihyperdrive::Options;
     use rand::{thread_rng, Rng, SeedableRng};
     use rand_chacha::ChaCha8Rng;
     use test_utils::{
@@ -363,11 +363,6 @@ mod tests {
 
             // Get state and trade details.
             let state = alice.get_state().await?;
-            let Checkpoint {
-                vault_share_price: open_vault_share_price,
-            } = alice
-                .get_checkpoint(state.to_checkpoint(alice.now().await?))
-                .await?;
             let max_long = bob.calculate_max_long(None).await?;
             let min_base_amount = FixedPoint::from(state.config.minimum_transaction_amount)
                 * FixedPoint::from(state.info.vault_share_price);
@@ -405,7 +400,7 @@ mod tests {
                         tolerance
                     );
                 }
-                Err(err) => {
+                Err(_) => {
                     assert!(bonds_purchased.is_err());
                 }
             }

crates/hyperdrive-math/src/short/max.rs

@@ -616,6 +616,8 @@ mod tests {
             let state = alice.get_state().await?;
             let Checkpoint {
                 vault_share_price: open_vault_share_price,
+                weighted_spot_price: _,
+                last_weighted_spot_price_update_time: _,
             } = alice
                 .get_checkpoint(state.to_checkpoint(alice.now().await?))
                 .await?;
@@ -691,6 +693,8 @@ mod tests {
             let state = alice.get_state().await?;
             let Checkpoint {
                 vault_share_price: open_vault_share_price,
+                weighted_spot_price: _,
+                last_weighted_spot_price_update_time: _,
             } = alice
                 .get_checkpoint(state.to_checkpoint(alice.now().await?))
                 .await?;

crates/hyperdrive-math/src/short/open.rs

@@ -871,6 +871,8 @@ mod tests {
             let state = alice.get_state().await?;
             let Checkpoint {
                 vault_share_price: open_vault_share_price,
+                weighted_spot_price: _,
+                last_weighted_spot_price_update_time: _,
             } = alice
                 .get_checkpoint(state.to_checkpoint(alice.now().await?))
                 .await?;

crates/hyperdrive-math/src/utils.rs

@@ -140,7 +140,6 @@ mod tests {
     use test_utils::{chain::TestChain, constants::FAST_FUZZ_RUNS};
 
     use super::*;
-    use crate::State;
 
     #[tokio::test]
     async fn fuzz_calculate_time_stretch() -> Result<()> {
@@ -172,47 +171,4 @@ mod tests {
 
         Ok(())
     }
-
-    #[tokio::test]
-    async fn fuzz_calculate_initial_bond_reserves() -> Result<()> {
-        let chain = TestChain::new().await?;
-
-        // Fuzz the rust and solidity implementations against each other.
-        let mut rng = thread_rng();
-        for _ in 0..*FAST_FUZZ_RUNS {
-            // Get the current state of the mock contract
-            let state = rng.gen::<State>();
-            let effective_share_reserves = calculate_effective_share_reserves(
-                state.info.share_reserves.into(),
-                state.info.share_adjustment.into(),
-            );
-            // Calculate the bonds
-            let actual = calculate_initial_bond_reserves(
-                effective_share_reserves,
-                state.config.initial_vault_share_price.into(),
-                fixed!(0.01e18),
-                state.config.position_duration.into(),
-                state.config.time_stretch.into(),
-            );
-            match chain
-                .mock_hyperdrive_math()
-                .calculate_initial_bond_reserves(
-                    effective_share_reserves.into(),
-                    state.config.initial_vault_share_price,
-                    fixed!(0.01e18).into(),
-                    state.config.position_duration,
-                    state.config.time_stretch,
-                )
-                .call()
-                .await
-            {
-                Ok(expected_y) => {
-                    assert_eq!(actual, FixedPoint::from(expected_y));
-                }
-                Err(_) => panic!("Test failed."),
-            }
-        }
-
-        Ok(())
-    }
 }

crates/hyperdrive-math/tests/integration_tests.rs

@@ -104,6 +104,8 @@ pub async fn test_integration_calculate_max_short() -> Result<()> {
         let state = alice.get_state().await?;
         let Checkpoint {
             vault_share_price: open_vault_share_price,
+            weighted_spot_price: _,
+            last_weighted_spot_price_update_time: _,
         } = alice
             .get_checkpoint(state.to_checkpoint(alice.now().await?))
             .await?;