Liquidity.Party/tycho-execution
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: fix encoder tests after removing the selector

Browse Source
This commit is contained in:
royvardhan
2025-02-24 20:48:55 +05:30
parent 18efe0305b
commit 570aa50497
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/encoding/evm/strategy_encoder/strategy_encoders.rs
View File

@@ -1,8 +1,8 @@
use std::{collections::HashSet, str::FromStr}; use std::{collections::HashSet, str::FromStr};
use alloy_primitives::{aliases::U24, FixedBytes, U256, U8}; use alloy_primitives::{aliases::U24, U256, U8};
use alloy_sol_types::SolValue; use alloy_sol_types::SolValue;
use tycho_core::{keccak256, Bytes}; use tycho_core::Bytes;
use crate::encoding::{ use crate::encoding::{
errors::EncodingError, errors::EncodingError,
@@ -538,8 +538,6 @@ mod tests {
"00", "00",
// executor address // executor address
"f62849f9a0b5bf2913b396098f7c7019b51a820a", "f62849f9a0b5bf2913b396098f7c7019b51a820a",
// callback selector
"91dd7346",
// first pool intermediary token (ETH) // first pool intermediary token (ETH)
"0000000000000000000000000000000000000000", "0000000000000000000000000000000000000000",
// fee // fee
@@ -663,22 +661,21 @@ mod tests {
let expected_swaps = String::from(concat!( let expected_swaps = String::from(concat!(
// length of ple encoded swaps without padding // length of ple encoded swaps without padding
"000000000000000000000000000000000000000000000000000000000000005c", "0000000000000000000000000000000000000000000000000000000000000058",
// ple encoded swaps // ple encoded swaps
"005a", "0056",
// Swap header // Swap header
"00", // token in index "00", // token in index
"01", // token out index "01", // token out index
"000000", // split "000000", // split
// Swap data // Swap data
"5c2f5a71f67c01775180adc06909288b4c329308", // executor address "5c2f5a71f67c01775180adc06909288b4c329308", // executor address
"bd0625ab", // selector
"c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in "c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in
"a478c2975ab1ea89e8196811f51a7b7ade33eb11", // component id "a478c2975ab1ea89e8196811f51a7b7ade33eb11", // component id
"3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver "3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver
"00", // zero2one "00", // zero2one
"00", // exact out "00", // exact out
"000000", // padding "00000000000000", // padding
)); ));
let hex_calldata = encode(&calldata); let hex_calldata = encode(&calldata);
@@ -986,21 +983,19 @@ mod tests {
let expected_swaps = String::from(concat!( let expected_swaps = String::from(concat!(
// length of ple encoded swaps without padding // length of ple encoded swaps without padding
"0000000000000000000000000000000000000000000000000000000000000094", "000000000000000000000000000000000000000000000000000000000000008c",
// ple encoded swaps // ple encoded swaps
"0092", // Swap length "008a", // Swap length
"00", // token in index "00", // token in index
"01", // token out index "01", // token out index
"000000", // split "000000", // split
// Swap data header // Swap data header
"f62849f9a0b5bf2913b396098f7c7019b51a820a", // executor address "f62849f9a0b5bf2913b396098f7c7019b51a820a", // executor address
"bd0625ab", // selector
// Protocol data // Protocol data
"a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", // group token in "a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", // group token in
"6982508145454ce325ddbe47a25d4ec3d2311933", // group token in "6982508145454ce325ddbe47a25d4ec3d2311933", // group token in
"00", // zero2one "00", // zero2one
"f62849f9a0b5bf2913b396098f7c7019b51a820a", // executor address "f62849f9a0b5bf2913b396098f7c7019b51a820a", // executor address
"91dd7346", // callback selector
// First pool params // First pool params
"0000000000000000000000000000000000000000", // intermediary token (ETH) "0000000000000000000000000000000000000000", // intermediary token (ETH)
"000bb8", // fee "000bb8", // fee
@@ -1009,8 +1004,9 @@ mod tests {
"6982508145454ce325ddbe47a25d4ec3d2311933", // intermediary token (PEPE) "6982508145454ce325ddbe47a25d4ec3d2311933", // intermediary token (PEPE)
"0061a8", // fee "0061a8", // fee
"0001f4", // tick spacing "0001f4", // tick spacing
"000000000000000000000000" // padding "0000000000000000000000000000000000000000" // padding
)); ));
let hex_calldata = encode(&calldata); let hex_calldata = encode(&calldata);
assert_eq!(hex_calldata[..520], expected_input); assert_eq!(hex_calldata[..520], expected_input);
@@ -1073,21 +1069,20 @@ mod tests {
"0000000000000000000000000000000000000000000000000000000000000002", // tokens length "0000000000000000000000000000000000000000000000000000000000000002", // tokens length
"000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2", // receiver "000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2", // receiver
"0000000000000000000000000000000000000000000000000000000000000120", // offset of ple encoded swaps "0000000000000000000000000000000000000000000000000000000000000120", // offset of ple encoded swaps
"000000000000000000000000000000000000000000000000000000000000005c", // length of ple encoded swaps without padding "0000000000000000000000000000000000000000000000000000000000000058", // length of ple encoded swaps without padding
"005a", // ple encoded swaps "0056", // ple encoded swaps
// Swap header // Swap header
"00", // token in index "00", // token in index
"01", // token out index "01", // token out index
"000000", // split "000000", // split
// Swap data // Swap data
"5c2f5a71f67c01775180adc06909288b4c329308", // executor address "5c2f5a71f67c01775180adc06909288b4c329308", // executor address
"bd0625ab", // selector
"c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in "c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in
"a478c2975ab1ea89e8196811f51a7b7ade33eb11", // component id "a478c2975ab1ea89e8196811f51a7b7ade33eb11", // component id
"3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver "3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver
"00", // zero2one "00", // zero2one
"00", // exact out "00", // exact out
"000000", // padding "00000000000000", // padding
] ]
.join(""); .join("");

4
src/encoding/evm/swap_encoder/swap_encoders.rs
View File

@@ -8,9 +8,7 @@ use crate::encoding::{
errors::EncodingError, errors::EncodingError,
evm::{ evm::{
approvals::protocol_approvals_manager::ProtocolApprovalsManager, approvals::protocol_approvals_manager::ProtocolApprovalsManager,
utils::{ utils::{bytes_to_address, get_static_attribute, pad_to_fixed_size},
bytes_to_address, encode_function_selector, get_static_attribute, pad_to_fixed_size,
},
}, },
models::{EncodingContext, Swap}, models::{EncodingContext, Swap},
swap_encoder::SwapEncoder, swap_encoder::SwapEncoder,