feat(op-angstrom): make testing-tools compile again

Author: mempirate

Cargo.lock

@@ -214,3 +214,9 @@ uniswap-v4 = { path = "./crates/uniswap-v4/" }
 uniswap_v3_math = { git = "https://github.com/SorellaLabs/v3-math", branch = "main" }
 url = "2"
 validation = { path = "./crates/validation/" }
+
+# OP-stack support
+reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }
+reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }
+reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }
+reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }

Cargo.toml

@@ -46,10 +46,10 @@ url.workspace = true
 validation.workspace = true
 
 # OP-stack support
-reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }
-reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }
-reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }
-reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", version = "1.6.0", tag = "v1.6.0" }
+reth-optimism-chainspec.workspace = true
+reth-optimism-cli.workspace = true
+reth-optimism-node.workspace = true
+reth-optimism-primitives.workspace = true
 
 [target.'cfg(unix)'.dependencies]
 tikv-jemallocator = { version = "0.6.0", optional = true }

bin/op-angstrom/Cargo.toml

@@ -202,7 +202,7 @@ pub async fn initialize_strom_components_at_block<Provider: WithWalletProvider>(
         Box::pin(eth_event_rx_stream) as Pin<Box<dyn Stream<Item = EthEvent> + Send + Sync>>;
 
     // Takes updates that are generally provided by EthDataCleanser
-    let uniswap_pool_manager = configure_uniswap_manager::<_, DEFAULT_TICKS>(
+    let uniswap_pool_manager = configure_uniswap_manager::<_, _, DEFAULT_TICKS>(
         provider.rpc_provider().into(),
         mock_canon.subscribe_to_canonical_state(),
         uniswap_registry,

testing-tools/src/controllers/strom/harness.rs

@@ -9,7 +9,7 @@ use std::{
 use alloy::{primitives::Address, providers::Provider, signers::local::PrivateKeySigner};
 use alloy_rpc_types::BlockId;
 use angstrom::components::StromHandles;
-use angstrom_amm_quoter::{QuoterHandle, QuoterManager};
+use angstrom_amm_quoter::{ConsensusQuoterManager, QuoterHandle};
 use angstrom_eth::{
     handle::Eth,
     manager::{EthDataCleanser, EthEvent}
@@ -183,7 +183,7 @@ impl<P: WithWalletProvider> AngstromNodeInternals<P> {
         let network_stream = Box::pin(eth_handle.subscribe_network())
             as Pin<Box<dyn Stream<Item = EthEvent> + Send + Sync>>;
 
-        let uniswap_pool_manager = configure_uniswap_manager::<_, DEFAULT_TICKS>(
+        let uniswap_pool_manager = configure_uniswap_manager::<_, _, DEFAULT_TICKS>(
             state_provider.rpc_provider().into(),
             eth_handle.subscribe_cannon_state_notifications().await,
             uniswap_registry.clone(),
@@ -338,7 +338,7 @@ impl<P: WithWalletProvider> AngstromNodeInternals<P> {
         );
 
         // spin up amm quoter
-        let amm = QuoterManager::new(
+        let amm = ConsensusQuoterManager::new(
             block_sync.clone(),
             order_storage.clone(),
             strom_handles.quoter_rx,

testing-tools/src/controllers/strom/internals.rs

@@ -10,7 +10,7 @@ use alloy_primitives::aliases::I24;
 use alloy_rpc_types::{BlockId, BlockNumberOrTag, Filter};
 use alloy_sol_types::SolEvent;
 use angstrom::components::initialize_strom_handles;
-use angstrom_amm_quoter::{QuoterHandle, QuoterManager};
+use angstrom_amm_quoter::{ConsensusQuoterManager, QuoterHandle};
 use angstrom_eth::{
     handle::Eth,
     manager::{EthDataCleanser, EthEvent}
@@ -277,7 +277,7 @@ impl ReplayRunner {
         let network_stream = Box::pin(eth_handle.subscribe_network())
             as Pin<Box<dyn Stream<Item = EthEvent> + Send + Sync>>;
 
-        let uniswap_pool_manager = configure_uniswap_manager::<_, 50>(
+        let uniswap_pool_manager = configure_uniswap_manager::<_, _, 50>(
             rpc.clone().into(),
             eth_handle.subscribe_cannon_state_notifications().await,
             uniswap_registry.clone(),
@@ -445,7 +445,7 @@ impl ReplayRunner {
         let consensus_client = ConsensusHandler(strom_handles.consensus_tx_rpc.clone());
 
         // spin up amm quoter
-        let amm = QuoterManager::new(
+        let amm = ConsensusQuoterManager::new(
             global_block_sync.clone(),
             order_storage.clone(),
             strom_handles.quoter_rx,