@@ -23,12 +23,6 @@ async fn local_node_place_order_with_quote_basic() {
2323 run_test ( place_order_with_quote) . await ;
2424}
2525
26- #[ tokio:: test]
27- #[ ignore]
28- async fn local_node_place_order_with_quote_same_token_pair ( ) {
29- run_test ( place_order_with_quote_same_token_pair) . await ;
30- }
31-
3226#[ tokio:: test]
3327#[ ignore]
3428async fn local_node_place_order_with_quote_same_token_pair_error ( ) {
@@ -172,92 +166,3 @@ async fn place_order_with_quote_same_token_pair_error(web3: Web3) {
172166 matches!( services. submit_quote( & quote_request) . await , Err ( ( reqwest:: StatusCode :: BAD_REQUEST , response) ) if response. contains( "SameBuyAndSellToken" ) )
173167 ) ;
174168}
175-
176- async fn place_order_with_quote_same_token_pair ( web3 : Web3 ) {
177- let mut onchain = OnchainComponents :: deploy ( web3. clone ( ) ) . await ;
178-
179- let [ solver] = onchain. make_solvers ( eth ( 10 ) ) . await ;
180- let [ trader] = onchain. make_accounts ( eth ( 10 ) ) . await ;
181- let [ token] = onchain
182- . deploy_tokens_with_weth_uni_v2_pools ( to_wei ( 1_000 ) , to_wei ( 1_000 ) )
183- . await ;
184-
185- token. mint ( trader. address ( ) , eth ( 10 ) ) . await ;
186-
187- token
188- . approve ( onchain. contracts ( ) . allowance . into_alloy ( ) , eth ( 10 ) )
189- . from ( trader. address ( ) )
190- . send_and_watch ( )
191- . await
192- . unwrap ( ) ;
193-
194- tracing:: info!( "Starting services." ) ;
195- let services = Services :: new ( & onchain) . await ;
196- services
197- . start_protocol_with_args (
198- ExtraServiceArgs {
199- api : vec ! [ "--allow-same-sell-and-buy-token=true" . to_string( ) ] ,
200- ..Default :: default ( )
201- } ,
202- solver. clone ( ) ,
203- )
204- . await ;
205-
206- // Disable auto-mine so we don't accidentally mine a settlement
207- web3. api :: < TestNodeApi < _ > > ( )
208- . set_automine_enabled ( false )
209- . await
210- . expect ( "Must be able to disable automine" ) ;
211-
212- tracing:: info!( "Quoting" ) ;
213- let quote_sell_amount = to_wei ( 1 ) ;
214- let quote_request = OrderQuoteRequest {
215- from : trader. address ( ) ,
216- sell_token : * token. address ( ) ,
217- buy_token : * token. address ( ) ,
218- side : OrderQuoteSide :: Sell {
219- sell_amount : SellAmount :: BeforeFee {
220- value : NonZeroU256 :: try_from ( quote_sell_amount) . unwrap ( ) ,
221- } ,
222- } ,
223- ..Default :: default ( )
224- } ;
225- let quote_response = services. submit_quote ( & quote_request) . await . unwrap ( ) ;
226- tracing:: debug!( ?quote_response) ;
227- assert ! ( quote_response. id. is_some( ) ) ;
228- assert ! ( quote_response. verified) ;
229-
230- let quote_metadata =
231- crate :: database:: quote_metadata ( services. db ( ) , quote_response. id . unwrap ( ) ) . await ;
232- assert ! ( quote_metadata. is_some( ) ) ;
233- tracing:: debug!( ?quote_metadata) ;
234-
235- tracing:: info!( "Placing order" ) ;
236- let order = OrderCreation {
237- quote_id : quote_response. id ,
238- sell_token : token. address ( ) . into_legacy ( ) ,
239- sell_amount : quote_sell_amount,
240- buy_token : token. address ( ) . into_legacy ( ) ,
241- buy_amount : quote_response. quote . buy_amount . into_legacy ( ) ,
242- valid_to : model:: time:: now_in_epoch_seconds ( ) + 300 ,
243- kind : OrderKind :: Sell ,
244- ..Default :: default ( )
245- }
246- . sign (
247- EcdsaSigningScheme :: Eip712 ,
248- & onchain. contracts ( ) . domain_separator ,
249- SecretKeyRef :: from ( & SecretKey :: from_slice ( trader. private_key ( ) ) . unwrap ( ) ) ,
250- ) ;
251- let order_uid = services. create_order ( & order) . await . unwrap ( ) ;
252-
253- tracing:: info!( "Order quote verification" ) ;
254- let order_quote = database:: orders:: read_quote (
255- services. db ( ) . acquire ( ) . await . unwrap ( ) . deref_mut ( ) ,
256- & database:: byte_array:: ByteArray ( order_uid. 0 ) ,
257- )
258- . await
259- . unwrap ( )
260- . unwrap ( ) ;
261- assert_eq ! ( quote_response. verified, order_quote. verified) ;
262- assert_eq ! ( quote_metadata. unwrap( ) . 0 , order_quote. metadata) ;
263- }
0 commit comments