From 0e70e827a02bb21adc47829fa60ba47a805269fe Mon Sep 17 00:00:00 2001 From: Diana Carvalho Date: Thu, 30 Jan 2025 13:19:09 +0000 Subject: [PATCH] chore: Rename encoder to strategy/swap_encoder This was confusing me when I had all of them open at the same time. Better to be extra explicit --- don't change below this line --- ENG-4081 Took 2 minutes --- src/encoding/evm/strategy_encoder/mod.rs | 4 ++-- .../evm/strategy_encoder/{encoder.rs => strategy_encoders.rs} | 0 .../strategy_encoder/{selector.rs => strategy_selector.rs} | 4 +++- src/encoding/evm/swap_encoder/builder.rs | 2 +- src/encoding/evm/swap_encoder/mod.rs | 2 +- .../evm/swap_encoder/{encoders.rs => swap_encoders.rs} | 0 6 files changed, 7 insertions(+), 5 deletions(-) rename src/encoding/evm/strategy_encoder/{encoder.rs => strategy_encoders.rs} (100%) rename src/encoding/evm/strategy_encoder/{selector.rs => strategy_selector.rs} (87%) rename src/encoding/evm/swap_encoder/{encoders.rs => swap_encoders.rs} (100%) diff --git a/src/encoding/evm/strategy_encoder/mod.rs b/src/encoding/evm/strategy_encoder/mod.rs index 9d36e12..44c9689 100644 --- a/src/encoding/evm/strategy_encoder/mod.rs +++ b/src/encoding/evm/strategy_encoder/mod.rs @@ -1,2 +1,2 @@ -mod encoder; -mod selector; +mod strategy_encoders; +mod strategy_selector; diff --git a/src/encoding/evm/strategy_encoder/encoder.rs b/src/encoding/evm/strategy_encoder/strategy_encoders.rs similarity index 100% rename from src/encoding/evm/strategy_encoder/encoder.rs rename to src/encoding/evm/strategy_encoder/strategy_encoders.rs diff --git a/src/encoding/evm/strategy_encoder/selector.rs b/src/encoding/evm/strategy_encoder/strategy_selector.rs similarity index 87% rename from src/encoding/evm/strategy_encoder/selector.rs rename to src/encoding/evm/strategy_encoder/strategy_selector.rs index b8e675c..2451711 100644 --- a/src/encoding/evm/strategy_encoder/selector.rs +++ b/src/encoding/evm/strategy_encoder/strategy_selector.rs @@ -2,7 +2,9 @@ use tycho_core::models::Chain; use crate::encoding::{ errors::EncodingError, - evm::strategy_encoder::encoder::{SplitSwapStrategyEncoder, StraightToPoolStrategyEncoder}, + evm::strategy_encoder::strategy_encoders::{ + SplitSwapStrategyEncoder, StraightToPoolStrategyEncoder, + }, models::Solution, strategy_encoder::{StrategyEncoder, StrategySelector}, }; diff --git a/src/encoding/evm/swap_encoder/builder.rs b/src/encoding/evm/swap_encoder/builder.rs index 141370e..cd5525b 100644 --- a/src/encoding/evm/swap_encoder/builder.rs +++ b/src/encoding/evm/swap_encoder/builder.rs @@ -1,5 +1,5 @@ use crate::encoding::{ - evm::swap_encoder::encoders::{BalancerV2SwapEncoder, UniswapV2SwapEncoder}, + evm::swap_encoder::swap_encoders::{BalancerV2SwapEncoder, UniswapV2SwapEncoder}, swap_encoder::SwapEncoder, }; diff --git a/src/encoding/evm/swap_encoder/mod.rs b/src/encoding/evm/swap_encoder/mod.rs index ebdb2d5..1148d2d 100644 --- a/src/encoding/evm/swap_encoder/mod.rs +++ b/src/encoding/evm/swap_encoder/mod.rs @@ -1,6 +1,6 @@ mod builder; -mod encoders; mod registry; +mod swap_encoders; use std::sync::RwLock; diff --git a/src/encoding/evm/swap_encoder/encoders.rs b/src/encoding/evm/swap_encoder/swap_encoders.rs similarity index 100% rename from src/encoding/evm/swap_encoder/encoders.rs rename to src/encoding/evm/swap_encoder/swap_encoders.rs