diff --git a/src/tests/book_manager/common.cairo b/src/tests/book_manager/common.cairo index 09038d8..92ac5a4 100644 --- a/src/tests/book_manager/common.cairo +++ b/src/tests/book_manager/common.cairo @@ -1,14 +1,32 @@ -use openzeppelin_token::erc20::ERC20Component::{Approval, Transfer}; -use openzeppelin_token::erc20::ERC20Component; use openzeppelin_testing::events::EventSpyExt; -use clober_cairo::book_manager::BookManager; +use openzeppelin_testing::constants::ZERO; use clober_cairo::book_manager::BookManager::{ Open, Make, Take, Cancel, Claim, Collect, Whitelist, Delist, SetDefaultProvider }; +use clober_cairo::libraries::book_key::BookKey; use clober_cairo::libraries::fee_policy::FeePolicy; use snforge_std::EventSpy; use starknet::ContractAddress; +pub fn BASE_URI() -> ByteArray { + "base_uri" +} + +pub fn CONTRACT_URI() -> ByteArray { + "contract_uri" +} + +pub fn valid_key(base: ContractAddress, quote: ContractAddress) -> BookKey { + BookKey { + base, + quote, + hooks: ZERO(), + unit_size: 1, + taker_policy: FeePolicy { uses_quote: true, rate: 0 }, + maker_policy: FeePolicy { uses_quote: true, rate: 0 }, + } +} + #[generate_trait] pub impl BookManagerSpyHelpersImpl of BookManagerSpyHelpers { fn assert_event_open( diff --git a/src/tests/book_manager/test_open.cairo b/src/tests/book_manager/test_open.cairo index 0ff4fb2..b012c1b 100644 --- a/src/tests/book_manager/test_open.cairo +++ b/src/tests/book_manager/test_open.cairo @@ -1,27 +1,21 @@ use starknet::ContractAddress; use clober_cairo::interfaces::book_manager::{IBookManagerDispatcher, IBookManagerDispatcherTrait}; -use clober_cairo::book_manager::BookManager; use clober_cairo::libraries::book_key::{BookKey, BookKeyTrait}; use clober_cairo::libraries::fee_policy::{FeePolicy, FeePolicyTrait, MAX_FEE_RATE, MIN_FEE_RATE}; use clober_cairo::mocks::open_router::OpenRouter::{ IOpenRouterDispatcher, IOpenRouterDispatcherTrait }; use clober_cairo::tests::utils::deploy_token_pairs; -use clober_cairo::tests::book_manager::common::BookManagerSpyHelpers; +use clober_cairo::tests::book_manager::common::{ + BookManagerSpyHelpers, valid_key, BASE_URI, CONTRACT_URI +}; use openzeppelin_testing as utils; -use openzeppelin_testing::constants::{ZERO, OWNER, SPENDER, RECIPIENT, OTHER, NAME, SYMBOL}; +use openzeppelin_testing::constants::{OWNER, SPENDER, RECIPIENT, OTHER, NAME, SYMBOL}; use openzeppelin_token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait}; use openzeppelin_testing::events::EventSpyExt; use openzeppelin_utils::serde::SerializedAppend; use snforge_std::{spy_events, EventSpy, start_cheat_caller_address}; -fn BASE_URI() -> ByteArray { - "base_uri" -} -fn CONTRACT_URI() -> ByteArray { - "contract_uri" -} - fn setup_dispatcher() -> (IBookManagerDispatcher, IOpenRouterDispatcher) { let mut calldata = array![]; @@ -43,19 +37,8 @@ fn setup_dispatcher() -> (IBookManagerDispatcher, IOpenRouterDispatcher) { ) } -fn valid_key(base: ContractAddress, quote: ContractAddress) -> BookKey { - BookKey { - base, - quote, - hooks: ZERO(), - unit_size: 1, - taker_policy: FeePolicy { uses_quote: true, rate: 0 }, - maker_policy: FeePolicy { uses_quote: true, rate: 0 }, - } -} - #[test] -fn test_open() { +fn test_success() { let (quote, base) = deploy_token_pairs(1000000, 1000000000000000000, OWNER(), OWNER()); let (bm, router) = setup_dispatcher();