From 881d4d80d864fa1fe50ccea373abb4282465155f Mon Sep 17 00:00:00 2001 From: --global <--global> Date: Wed, 17 Jan 2024 16:14:10 +0100 Subject: [PATCH] Remove leftover changes --- contracts/factory/src/tests/setup.rs | 2 +- contracts/multihop/src/storage.rs | 9 --------- contracts/pool/src/contract.rs | 1 - contracts/pool/src/tests/swap.rs | 1 - 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/contracts/factory/src/tests/setup.rs b/contracts/factory/src/tests/setup.rs index 3d6dec04d..5e220a3ba 100644 --- a/contracts/factory/src/tests/setup.rs +++ b/contracts/factory/src/tests/setup.rs @@ -38,7 +38,7 @@ pub fn deploy_factory_contract<'a>( env: &Env, admin: impl Into>, ) -> FactoryClient<'a> { - let admin = admin.into().unwrap_or(Address::generate(&env)); + let admin = admin.into().unwrap_or(Address::generate(env)); let factory = FactoryClient::new(env, &env.register_contract(None, Factory {})); let multihop_wasm_hash = install_multihop_wasm(env); diff --git a/contracts/multihop/src/storage.rs b/contracts/multihop/src/storage.rs index 3dde62ece..a88f8aa0b 100644 --- a/contracts/multihop/src/storage.rs +++ b/contracts/multihop/src/storage.rs @@ -1,14 +1,5 @@ use soroban_sdk::{contracttype, Address, Env, Vec}; -#[contracttype] -#[derive(Clone, Debug, PartialEq, Eq)] -pub struct Referral { - /// Address of the referral - pub address: Address, - /// fee in bps, later parsed to percentage - pub fee: i64, -} - #[contracttype] #[derive(Clone, Debug, Eq, PartialEq)] pub struct Swap { diff --git a/contracts/pool/src/contract.rs b/contracts/pool/src/contract.rs index e36a54bb4..52e074b47 100644 --- a/contracts/pool/src/contract.rs +++ b/contracts/pool/src/contract.rs @@ -17,7 +17,6 @@ use crate::{ }; use decimal::Decimal; use phoenix::{ - referral::Referral, utils::{assert_approx_ratio, StakeInitInfo, TokenInitInfo}, validate_int_parameters, }; diff --git a/contracts/pool/src/tests/swap.rs b/contracts/pool/src/tests/swap.rs index 9e7035b0a..27f944d69 100644 --- a/contracts/pool/src/tests/swap.rs +++ b/contracts/pool/src/tests/swap.rs @@ -7,7 +7,6 @@ use test_case::test_case; use super::setup::{deploy_liquidity_pool_contract, deploy_token_contract}; use crate::storage::{Asset, PoolResponse, SimulateReverseSwapResponse, SimulateSwapResponse}; use decimal::Decimal; -use phoenix::referral::Referral; #[test] fn simple_swap() {