LaconicNetwork/vega-frontend-monorepo
3
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

chore(trading): vegaservice import (#5536)

Browse Source
This commit is contained in:
Ben 2023-12-27 08:17:20 +00:00 committed by GitHub
parent b2c7ee82c5
commit 424cced4be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 96 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/trading/e2e/tests/deal_ticket/test_basic_submit.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from datetime import datetime, timedelta
from conftest import init_vega
from fixtures.market import setup_continuous_market
@ -24,7 +24,7 @@ def continuous_market(vega):
return setup_continuous_market(vega)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_limit_buy_order_GTT(continuous_market, vega: VegaService, page: Page):
def test_limit_buy_order_GTT(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(tif).select_option("Good 'til Time (GTT)")
page.get_by_test_id(order_size).fill("10")
@ -52,7 +52,7 @@ def test_limit_buy_order_GTT(continuous_market, vega: VegaService, page: Page):
)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_limit_buy_order(continuous_market, vega: VegaService, page: Page):
def test_limit_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(order_size).fill("10")
@ -69,7 +69,7 @@ def test_limit_buy_order(continuous_market, vega: VegaService, page: Page):
)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_limit_sell_order(continuous_market, vega: VegaService, page: Page):
def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(order_size).fill("10")
page.get_by_test_id(order_price).fill("100")
@ -93,7 +93,7 @@ def test_limit_sell_order(continuous_market, vega: VegaService, page: Page):
)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_market_sell_order(continuous_market, vega: VegaService, page: Page):
def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(market_order).click()
page.get_by_test_id(order_size).fill("10")
@ -117,7 +117,7 @@ def test_market_sell_order(continuous_market, vega: VegaService, page: Page):
)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_market_buy_order(continuous_market, vega: VegaService, page: Page):
def test_market_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(market_order).click()
page.get_by_test_id(order_size).fill("10")

4
apps/trading/e2e/tests/deal_ticket/test_fees_margin_estimations.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from actions.utils import wait_for_toast_confirmation
@ -13,7 +13,7 @@ market_trading_mode = "market-trading-mode"
@pytest.mark.skip("tbd")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_margin_and_fees_estimations(continuous_market, vega: VegaService, page: Page):
def test_margin_and_fees_estimations(continuous_market, vega: VegaServiceNull, page: Page):
# setup continuous trading market with one user buy trade
market_id = continuous_market
page.goto(f"/#/markets/{market_id}")

14
apps/trading/e2e/tests/deal_ticket/test_stop_order.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from datetime import datetime, timedelta
from conftest import init_vega
@ -38,7 +38,7 @@ timeInForce_col = '[col-id="submission.timeInForce"]'
updatedAt_col = '[col-id="updatedAt"]'
close_toast = "toast-close"
def create_position(vega: VegaService, market_id):
def create_position(vega: VegaServiceNull, market_id):
submit_order(vega, "Key 1", market_id, "SIDE_SELL", 100, 110)
submit_order(vega, "Key 1", market_id, "SIDE_BUY", 100, 110)
vega.forward("10s")
@ -69,7 +69,7 @@ def test_stop_order_form_error_validation(continuous_market, page: Page):
@pytest.mark.skip("core issue")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_order_rejected(continuous_market, vega: VegaService, page: Page):
def test_submit_stop_order_rejected(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(stop_orders_tab).click()
page.get_by_test_id(stop_order_btn).click()
@ -108,7 +108,7 @@ def test_submit_stop_order_rejected(continuous_market, vega: VegaService, page:
@pytest.mark.skip("core issue")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_market_order_triggered(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
# 7002-SORD-071
# 7002-SORD-074
@ -166,7 +166,7 @@ def test_submit_stop_market_order_triggered(
@pytest.mark.skip("core issue")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_limit_order_pending(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
# 7002-SORD-071
# 7002-SORD-074
@ -227,7 +227,7 @@ def test_submit_stop_limit_order_pending(
@pytest.mark.skip("core issue")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_limit_order_cancel(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(stop_orders_tab).click()
@ -348,7 +348,7 @@ class TestStopOcoValidation:
@pytest.mark.skip("core issue")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_maximum_number_of_active_stop_orders(
self, continuous_market, vega: VegaService, page: Page
self, continuous_market, vega: VegaServiceNull, page: Page
):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(stop_orders_tab).click()

14
apps/trading/e2e/tests/deal_ticket/test_stop_order_oco.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from actions.utils import wait_for_toast_confirmation
@ -42,7 +42,7 @@ trigger_price_oco = "triggerPrice-oco"
order_size_oco = "order-size-oco"
order_limit_price_oco = "order-price-oco"
def create_position(vega: VegaService, market_id):
def create_position(vega: VegaServiceNull, market_id):
submit_order(vega, "Key 1", market_id, "SIDE_SELL", 100, 110)
submit_order(vega, "Key 1", market_id, "SIDE_BUY", 100, 110)
vega.wait_fn(1)
@ -51,7 +51,7 @@ def create_position(vega: VegaService, market_id):
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_order_market_oco_rejected(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id(stop_orders_tab).click()
@ -128,7 +128,7 @@ def test_submit_stop_order_market_oco_rejected(
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_oco_market_order_triggered(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
create_position(vega, continuous_market)
page.goto(f"/#/markets/{continuous_market}")
@ -205,7 +205,7 @@ def test_submit_stop_oco_market_order_triggered(
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_oco_market_order_pending(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
create_position(vega, continuous_market)
page.goto(f"/#/markets/{continuous_market}")
@ -237,7 +237,7 @@ def test_submit_stop_oco_market_order_pending(
@pytest.mark.usefixtures("page", "continuous_market", "auth", "risk_accepted")
def test_submit_stop_oco_limit_order_pending(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
create_position(vega, continuous_market)
page.goto(f"/#/markets/{continuous_market}")
@ -288,7 +288,7 @@ def test_submit_stop_oco_limit_order_pending(
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_submit_stop_oco_limit_order_cancel(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
create_position(vega, continuous_market)
page.goto(f"/#/markets/{continuous_market}")

4
apps/trading/e2e/tests/deal_ticket/test_trading_deal_ticket_submit_account.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.utils import change_keys
from conftest import init_vega
from fixtures.market import setup_continuous_market
@ -33,7 +33,7 @@ def test_should_display_info_and_button_for_deposit(continuous_market, page: Pag
expect(page.get_by_test_id("sidebar-content")).to_contain_text("DepositFrom")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_should_show_an_error_if_your_balance_is_zero(continuous_market, vega: VegaService, page: Page):
def test_should_show_an_error_if_your_balance_is_zero(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
vega.create_key("key_empty")
change_keys(page, vega, "key_empty")

8
apps/trading/e2e/tests/fees/test_fees.py
View File

@ -1,7 +1,7 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from wallet_config import MM_WALLET
from conftest import init_vega, init_page, auth_setup
@ -143,7 +143,7 @@ def auth(vega_instance, page):
return auth_setup(vega_instance, page)
def setup_market_with_volume_discount_program(vega: VegaService, tier: int):
def setup_market_with_volume_discount_program(vega: VegaServiceNull, tier: int):
market = setup_continuous_market(vega, custom_quantum=100000)
vega.update_volume_discount_program(
proposal_key=MM_WALLET.name,
@ -169,7 +169,7 @@ def setup_market_with_volume_discount_program(vega: VegaService, tier: int):
return market
def setup_market_with_referral_discount_program(vega: VegaService, tier: int):
def setup_market_with_referral_discount_program(vega: VegaServiceNull, tier: int):
market = setup_continuous_market(vega, custom_quantum=100000)
vega.update_referral_program(
proposal_key=MM_WALLET.name,
@ -208,7 +208,7 @@ def setup_market_with_referral_discount_program(vega: VegaService, tier: int):
return market
def setup_combined_market(vega: VegaService):
def setup_combined_market(vega: VegaServiceNull):
market = setup_continuous_market(vega, custom_quantum=100000)
vega.update_volume_discount_program(
proposal_key=MM_WALLET.name,

10
apps/trading/e2e/tests/get_started/test_get_started.py
View File

@ -1,7 +1,7 @@
import pytest
from playwright.sync_api import expect, Page
import json
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from fixtures.market import setup_simple_market
from conftest import init_vega
from actions.vega import submit_order
@ -16,11 +16,11 @@ def vega():
yield vega
@pytest.fixture(scope="class")
def simple_market(vega: VegaService):
def simple_market(vega: VegaServiceNull):
return setup_simple_market(vega)
class TestGetStarted:
def test_get_started_interactive(self, vega: VegaService, page: Page):
def test_get_started_interactive(self, vega: VegaServiceNull, page: Page):
page.goto("/")
# 0007-FUGS-001
expect(page.get_by_test_id("order-connect-wallet")).to_be_visible
@ -166,7 +166,7 @@ class TestGetStarted:
page.wait_for_selector('[data-testid="sidebar-content"]', state="visible")
expect(page.get_by_test_id("get-started-banner")).not_to_be_visible()
def test_redirect_default_market(self, continuous_market, vega: VegaService, page: Page):
def test_redirect_default_market(self, continuous_market, vega: VegaServiceNull, page: Page):
page.goto("/")
# 0007-FUGS-012
expect(page).to_have_url(
@ -177,7 +177,7 @@ class TestGetStarted:
expect(page.get_by_test_id("welcome-dialog")).not_to_be_visible()
class TestBrowseAll:
def test_get_started_browse_all(self, simple_market, vega: VegaService, page: Page):
def test_get_started_browse_all(self, simple_market, vega: VegaServiceNull, page: Page):
page.goto("/")
print(simple_market)
page.get_by_test_id("browse-markets-button").click()

6
apps/trading/e2e/tests/iceberg_orders/test_iceberg_orders.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import expect, Page
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from conftest import init_vega
from fixtures.market import setup_continuous_market
@ -22,7 +22,7 @@ class TestIcebergOrdersValidations:
return setup_continuous_market(vega)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_iceberg_submit(self, continuous_market, vega: VegaService, page: Page):
def test_iceberg_submit(self, continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id("iceberg").click()
page.get_by_test_id("order-peak-size").type("2")
@ -47,7 +47,7 @@ class TestIcebergOrdersValidations:
).to_have_text("Limit (Iceberg)")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_iceberg_open_order(continuous_market, vega: VegaService, page: Page):
def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
submit_order(vega, "Key 1", continuous_market, "SIDE_SELL", 102, 101, 2, 1)

6
apps/trading/e2e/tests/liquidity_provision/test_liquidity_provision.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from conftest import init_vega
from fixtures.market import setup_continuous_market
from actions.utils import next_epoch, truncate_middle, change_keys
@ -18,7 +18,7 @@ def continuous_market(vega):
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_liquidity_provision_amendment(continuous_market, vega: VegaService, page: Page):
def test_liquidity_provision_amendment(continuous_market, vega: VegaServiceNull, page: Page):
# TODO Refactor asserting the grid
page.goto(f"/#/liquidity/{continuous_market}")
change_keys(page, vega, "market_maker")
@ -77,7 +77,7 @@ def test_liquidity_provision_amendment(continuous_market, vega: VegaService, pag
@pytest.mark.skip("Waiting for the ability to cancel LP")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_liquidity_provision_inactive(continuous_market, vega: VegaService, page: Page):
def test_liquidity_provision_inactive(continuous_market, vega: VegaServiceNull, page: Page):
# TODO Refactor asserting the grid
page.goto(f"/#/liquidity/{continuous_market}")
change_keys(page, vega, "market_maker")

6
apps/trading/e2e/tests/market/test_closed_markets.py
View File

@ -1,7 +1,7 @@
import pytest
import re
import vega_sim.api.governance as governance
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from playwright.sync_api import Page, expect
from fixtures.market import setup_continuous_market
from conftest import init_vega
@ -14,7 +14,7 @@ def vega():
@pytest.fixture(scope="class")
def create_settled_market(vega: VegaService):
def create_settled_market(vega: VegaServiceNull):
market_id = setup_continuous_market(vega)
vega.submit_termination_and_settlement_data(
settlement_key="FJMKnwfZdd48C8NqvYrG",
@ -115,7 +115,7 @@ class TestSettledMarket:
@pytest.mark.usefixtures("risk_accepted", "auth")
def test_terminated_market_no_settlement_date(page: Page, vega: VegaService):
def test_terminated_market_no_settlement_date(page: Page, vega: VegaServiceNull):
setup_continuous_market(vega)
print("I have started test_terminated_market_no_settlement_date")
governance.submit_oracle_data(

6
apps/trading/e2e/tests/market/test_market.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from actions.utils import change_keys
from wallet_config import MM_WALLET, MM_WALLET2
@ -32,7 +32,7 @@ market_name = "BTC:DAI_2023"
@pytest.mark.usefixtures("risk_accepted", "auth")
def test_price_monitoring(simple_market, vega: VegaService, page: Page):
def test_price_monitoring(simple_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/all")
expect(page.locator(table_row_selector).locator(trading_mode_col)).to_have_text(
"Opening auction"
@ -202,7 +202,7 @@ COL_ID_FEE = ".ag-center-cols-container [col-id='fee'] .ag-cell-value"
@pytest.mark.usefixtures("risk_accepted", "auth")
def test_auction_uncross_fees(continuous_market, vega: VegaService, page: Page):
def test_auction_uncross_fees(continuous_market, vega: VegaServiceNull, page: Page):
page.goto(f"/#/markets/{continuous_market}")
page.get_by_test_id("Fills").click()
expect(page.locator(COL_ID_FEE)).to_have_text("0.00 tDAI")

11
apps/trading/e2e/tests/market/test_market_info.py
View File

@ -1,7 +1,7 @@
import re
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from fixtures.market import setup_continuous_market
from conftest import init_page, init_vega, risk_accepted_setup
@ -88,7 +88,7 @@ def test_market_info_insurance_pool(page: Page):
validate_info_section(page, fields)
def test_market_info_key_details(page: Page, vega: VegaService):
def test_market_info_key_details(page: Page, vega: VegaServiceNull):
# 6002-MDET-201
page.get_by_test_id(market_title_test_id).get_by_text("Key details").click()
market_id = vega.find_market_id("BTC:DAI_2023")
@ -136,7 +136,7 @@ def test_market_info_oracle(page: Page):
# )
def test_market_info_settlement_asset(page: Page, vega: VegaService):
def test_market_info_settlement_asset(page: Page, vega: VegaServiceNull):
# 6002-MDET-206
page.get_by_test_id(market_title_test_id).get_by_text("Settlement asset").click()
tdai_id = vega.find_asset_id("tDAI")
@ -260,7 +260,7 @@ def test_market_info_liquidity_price_range(page: Page):
validate_info_section(page, fields)
def test_market_info_proposal(page: Page, vega: VegaService):
def test_market_info_proposal(page: Page, vega: VegaServiceNull):
# 6002-MDET-301
page.get_by_test_id(market_title_test_id).get_by_text("Proposal").click()
first_link = (
@ -280,8 +280,9 @@ def test_market_info_proposal(page: Page, vega: VegaService):
"href", re.compile(r"(\/proposals\/propose\/update-market)")
)
@pytest.mark.skip("tbd-market-sim")
def test_market_info_succession_line(page: Page, vega: VegaService):
def test_market_info_succession_line(page: Page, vega: VegaServiceNull):
page.get_by_test_id(market_title_test_id).get_by_text("Succession line").click()
market_id = vega.find_market_id("BTC:DAI_2023")
succession_line = page.get_by_test_id("succession-line-item")

4
apps/trading/e2e/tests/market/test_markets_proposed.py
View File

@ -2,7 +2,7 @@ import pytest
import vega_sim.api.governance as governance
import re
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from conftest import init_vega
from fixtures.market import setup_simple_market
from wallet_config import MM_WALLET
@ -18,7 +18,7 @@ def vega(request):
@pytest.fixture(scope="module")
def proposed_market(vega: VegaService):
def proposed_market(vega: VegaServiceNull):
# setup market without liquidity provided
market_id = setup_simple_market(vega, approve_proposal=False)
# approve market

6
apps/trading/e2e/tests/market/test_monitoring_auction_price_volatility_market.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from fixtures.market import setup_simple_market
from conftest import init_vega
@ -20,7 +20,7 @@ def simple_market(vega):
@pytest.fixture(scope="module")
def setup_market_monitoring_auction(vega: VegaService, simple_market):
def setup_market_monitoring_auction(vega: VegaServiceNull, simple_market):
vega.submit_liquidity(
key_name=MM_WALLET.name,
market_id=simple_market,
@ -82,7 +82,7 @@ def setup_market_monitoring_auction(vega: VegaService, simple_market):
@pytest.mark.usefixtures("risk_accepted", "auth", "setup_market_monitoring_auction")
def test_market_monitoring_auction_price_volatility_limit_order(
page: Page, simple_market, vega: VegaService
page: Page, simple_market, vega: VegaServiceNull
):
page.goto(f"/#/markets/{simple_market}")
page.get_by_test_id("order-size").clear()

5
apps/trading/e2e/tests/market_lifecycle/test_market_lifecycle.py
View File

@ -2,7 +2,8 @@ import pytest
import re
import vega_sim.api.governance as governance
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService, PeggedOrder
from vega_sim.null_service import VegaServiceNull
from vega_sim.service import PeggedOrder
import vega_sim.api.governance as governance
from actions.vega import submit_order
from actions.utils import next_epoch
@ -10,7 +11,7 @@ from wallet_config import MM_WALLET, MM_WALLET2, GOVERNANCE_WALLET
@pytest.mark.usefixtures("risk_accepted")
def test_market_lifecycle(proposed_market, vega: VegaService, page: Page):
def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
# 7002-SORD-001
# 7002-SORD-002
trading_mode = page.get_by_test_id("market-trading-mode").get_by_test_id(

4
apps/trading/e2e/tests/order/test_order_details.py
View File

@ -1,7 +1,7 @@
import pytest
import re
from playwright.sync_api import expect, Page
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
order_details = [
@ -52,7 +52,7 @@ def verify_order_value(
@pytest.mark.skip("tbd")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_order_details_are_correctly_displayed(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
page.goto(f"/#/markets/{continuous_market}")
submit_order(vega, "Key 1", vega.all_markets()[0].id, "SIDE_SELL", 102, 101, 2, 1)

6
apps/trading/e2e/tests/order/test_order_match.py
View File

@ -2,7 +2,7 @@ import pytest
import re
import logging
from playwright.sync_api import expect, Page
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from playwright.sync_api import expect
from actions.vega import submit_order
@ -38,7 +38,7 @@ def verify_data_grid(page: Page, data_test_id, expected_pattern):
raise AssertionError(f"Pattern does not match: {expected} != {actual}")
def submit_order(vega: VegaService, wallet_name, market_id, side, volume, price):
def submit_order(vega: VegaServiceNull, wallet_name, market_id, side, volume, price):
vega.submit_order(
trading_key=wallet_name,
market_id=market_id,
@ -52,7 +52,7 @@ def submit_order(vega: VegaService, wallet_name, market_id, side, volume, price)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_limit_order_trade_open_order(
opening_auction_market, vega: VegaService, page: Page
opening_auction_market, vega: VegaServiceNull, page: Page
):
market_id = opening_auction_market
submit_order(vega, "Key 1", market_id, "SIDE_BUY", 1, 110)

11
apps/trading/e2e/tests/order/test_order_status.py
View File

@ -1,6 +1,7 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService, PeggedOrder
from vega_sim.service import PeggedOrder
from vega_sim.null_service import VegaServiceNull
from conftest import auth_setup, init_page, init_vega, risk_accepted_setup
from fixtures.market import setup_continuous_market, setup_simple_market
from actions.utils import wait_for_toast_confirmation
@ -15,7 +16,7 @@ def vega(request):
@pytest.fixture(scope="module", autouse=True)
def markets(vega: VegaService):
def markets(vega: VegaServiceNull):
market_1 = setup_continuous_market(
vega,
custom_market_name="market-1",
@ -357,7 +358,7 @@ def test_order_status_pegged_mid(page: Page):
)
def test_order_amend_order(vega: VegaService, page: Page):
def test_order_amend_order(vega: VegaServiceNull, page: Page):
# 7002-SORD-053
# 7003-MORD-012
# 7003-MORD-014
@ -377,7 +378,7 @@ def test_order_amend_order(vega: VegaService, page: Page):
)
def test_order_cancel_single_order(vega: VegaService, page: Page):
def test_order_cancel_single_order(vega: VegaServiceNull, page: Page):
# 7003-MORD-009
# 7003-MORD-010
# 7003-MORD-011
@ -394,7 +395,7 @@ def test_order_cancel_single_order(vega: VegaService, page: Page):
)
def test_order_cancel_all_orders(vega: VegaService, page: Page):
def test_order_cancel_all_orders(vega: VegaServiceNull, page: Page):
# 7003-MORD-009
# 7003-MORD-010
# 7003-MORD-011

8
apps/trading/e2e/tests/perpetual_market/test_perpetuals.py
View File

@ -1,7 +1,7 @@
import pytest
import re
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from vega_sim.service import MarketStateUpdateType
from datetime import datetime, timedelta
from conftest import init_vega
@ -21,7 +21,7 @@ class TestPerpetuals:
yield vega
@pytest.fixture(scope="class")
def perps_market(self, vega: VegaService):
def perps_market(self, vega: VegaServiceNull):
perps_market = setup_perps_market(vega)
submit_multiple_orders(
vega, MM_WALLET.name, perps_market, "SIDE_SELL", [[1, 110], [1, 105]]
@ -96,7 +96,7 @@ class TestPerpetuals:
@pytest.mark.usefixtures("risk_accepted", "auth")
def test_perps_market_termination_proposed(page: Page, vega: VegaService):
def test_perps_market_termination_proposed(page: Page, vega: VegaServiceNull):
perpetual_market = setup_perps_market(vega)
page.goto(f"/#/markets/{perpetual_market}")
vega.update_market_state(
@ -124,7 +124,7 @@ def test_perps_market_termination_proposed(page: Page, vega: VegaService):
@pytest.mark.usefixtures("risk_accepted", "auth")
def test_perps_market_terminated(page: Page, vega: VegaService):
def test_perps_market_terminated(page: Page, vega: VegaServiceNull):
perpetual_market = setup_perps_market(vega)
vega.update_market_state(
proposal_key=MM_WALLET.name,

4
apps/trading/e2e/tests/pnl/test_pnl.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_order
from actions.utils import change_keys
@ -13,7 +13,7 @@ def check_pnl_color_value(element, expected_color, expected_value):
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_pnl(continuous_market, vega: VegaService, page: Page):
def test_pnl(continuous_market, vega: VegaServiceNull, page: Page):
page.set_viewport_size({"width": 1748, "height": 977})
submit_order(vega, "Key 1", continuous_market, "SIDE_BUY", 1, 104.50000)
vega.wait_fn(1)

4
apps/trading/e2e/tests/positions/test_collateral.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from conftest import init_vega
from fixtures.market import setup_continuous_market
@ -16,7 +16,7 @@ def vega(request):
@pytest.fixture(scope="module")
def continuous_market(vega: VegaService):
def continuous_market(vega: VegaServiceNull):
return setup_continuous_market(vega)

4
apps/trading/e2e/tests/positions/test_positions.py
View File

@ -1,13 +1,13 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from fixtures.market import (
setup_continuous_market,
)
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_closed_market_position(vega: VegaService, page: Page):
def test_closed_market_position(vega: VegaServiceNull, page: Page):
market_id = setup_continuous_market(vega)
vega.submit_termination_and_settlement_data(

10
apps/trading/e2e/tests/referrals/test_referrals.py
View File

@ -1,6 +1,6 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from playwright.sync_api import Page
from vega_sim.null_service import VegaServiceNull
from conftest import init_vega
from fixtures.market import setup_continuous_market, setup_simple_market
from actions.utils import change_keys, create_and_faucet_wallet, forward_time, selector_contains_text
@ -72,7 +72,7 @@ def create_staking_tier(minimum_staked_tokens, referral_reward_multiplier):
}
def setup_market_and_referral_scheme(vega: VegaService, continuous_market: str, page: Page):
def setup_market_and_referral_scheme(vega: VegaServiceNull, continuous_market: str, page: Page):
page.goto(f"/#/markets/{continuous_market}")
create_and_faucet_wallet(vega=vega, wallet=PARTY_A)
@ -118,7 +118,7 @@ def setup_market_and_referral_scheme(vega: VegaService, continuous_market: str,
@pytest.mark.usefixtures("page", "auth", "risk_accepted")
def test_can_traverse_up_and_down_through_tiers(continuous_market, vega: VegaService, page: Page):
def test_can_traverse_up_and_down_through_tiers(continuous_market, vega: VegaServiceNull, page: Page):
setup_market_and_referral_scheme(vega, continuous_market, page)
change_keys(page, vega, PARTY_B.name)
submit_order(vega, PARTY_B.name, continuous_market, "SIDE_BUY", 1, 115)
@ -162,7 +162,7 @@ def test_can_traverse_up_and_down_through_tiers(continuous_market, vega: VegaSer
@pytest.mark.usefixtures("page", "auth", "risk_accepted")
def test_does_not_move_up_tiers_when_not_enough_epochs(continuous_market, vega: VegaService, page: Page):
def test_does_not_move_up_tiers_when_not_enough_epochs(continuous_market, vega: VegaServiceNull, page: Page):
setup_market_and_referral_scheme(vega, continuous_market, page)
change_keys(page, vega, PARTY_B.name)
submit_order(vega, PARTY_B.name, continuous_market, "SIDE_BUY", 2, 115)

4
apps/trading/e2e/tests/successor_market/test_succession_line.py
View File

@ -1,12 +1,12 @@
import pytest
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from fixtures.market import setup_continuous_market, setup_simple_successor_market
@pytest.fixture
@pytest.mark.usefixtures()
def successor_market(vega: VegaService):
def successor_market(vega: VegaServiceNull):
parent_market_id = setup_continuous_market(vega)
tdai_id = vega.find_asset_id(symbol="tDAI")
successor_market_id = setup_simple_successor_market(

4
apps/trading/e2e/tests/trade_history/test_trade_history.py
View File

@ -5,7 +5,7 @@ from playwright.sync_api import expect
from actions.vega import submit_order
from conftest import init_vega
from playwright.sync_api import Page
from vega_sim.null_service import VegaService
from vega_sim.null_service import VegaServiceNull
logger = logging.getLogger()
@ -47,7 +47,7 @@ def verify_data_grid(page: Page, data_test_id, expected_pattern):
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_limit_order_new_trade_top_of_list(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
submit_order(vega, "Key 1", continuous_market, "SIDE_BUY", 1, 110)
vega.wait_fn(1)

4
apps/trading/e2e/tests/trade_match/test_trade_match.py
View File

@ -1,13 +1,13 @@
import pytest
from playwright.sync_api import expect, Page
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.vega import submit_multiple_orders
@pytest.mark.skip("tbd")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_trade_match_table(opening_auction_market: str, vega: VegaService, page: Page):
def test_trade_match_table(opening_auction_market: str, vega: VegaServiceNull, page: Page):
row_locator = ".ag-center-cols-container .ag-row"
page.goto(f"/#/markets/{opening_auction_market}")

4
apps/trading/e2e/tests/trading_chart/test_trading_chart.py
View File

@ -2,7 +2,7 @@
# import re
# from collections import namedtuple
# from playwright.sync_api import Page
# from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
# from actions.vega import submit_order
# import logging
@ -14,7 +14,7 @@
# @pytest.mark.skip("temporary skip")
# @pytest.mark.parametrize(, [120], indirect=True)
# @pytest.mark.usefixtures("continuous_market","risk_accepted", "auth")
# def test_trading_chart(continuous_market, vega: VegaService, page: Page):
# def test_trading_chart(continuous_market, vega: VegaServiceNull, page: Page):
# page.goto(f"/#/markets/{continuous_market}")
# vega.forward("24h")
# vega.wait_for_total_catchup()

6
apps/trading/e2e/tests/transfer/test_transfer_key_to_key.py
View File

@ -1,7 +1,7 @@
import pytest
import re
from playwright.sync_api import Page, expect
from vega_sim.service import VegaService
from vega_sim.null_service import VegaServiceNull
from actions.utils import (
wait_for_toast_confirmation,
create_and_faucet_wallet,
@ -18,7 +18,7 @@ PARTY_C = WalletConfig("party_c", "party_c")
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_transfer_submit(continuous_market, vega: VegaService, page: Page):
def test_transfer_submit(continuous_market, vega: VegaServiceNull, page: Page):
# 1003-TRAN-001
# 1003-TRAN-006
# 1003-TRAN-007
@ -64,7 +64,7 @@ def test_transfer_submit(continuous_market, vega: VegaService, page: Page):
@pytest.mark.usefixtures("auth", "risk_accepted")
def test_transfer_vesting_below_minimum(
continuous_market, vega: VegaService, page: Page
continuous_market, vega: VegaServiceNull, page: Page
):
vega.update_network_parameter(
"market_maker",

1
apps/trading/e2e/tests/wallet/test_wallet.py
View File

@ -2,7 +2,6 @@ import pytest
import re
import json
from playwright.sync_api import Page, expect, Route
from vega_sim.service import VegaService
from conftest import init_vega
from fixtures.market import setup_continuous_market