From 5d4b8360896298246cb6fe50daeb46948098da59 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 5 Oct 2022 15:48:29 +0200 Subject: [PATCH 1/3] Pytests: del SelfAddressTransfer in tests_015/test_contract.py (!6437) --- tests_python/tests_015/test_contract.py | 35 ------------------------- 1 file changed, 35 deletions(-) diff --git a/tests_python/tests_015/test_contract.py b/tests_python/tests_015/test_contract.py index 2246374c1035..126a99721866 100644 --- a/tests_python/tests_015/test_contract.py +++ b/tests_python/tests_015/test_contract.py @@ -1860,41 +1860,6 @@ class TestOrderInTopLevelDoesNotMatter: client.typecheck(contract, file=False) -@pytest.mark.incremental -@pytest.mark.contract -@pytest.mark.regression -class TestSelfAddressTransfer: - def test_self_address_originate_sender( - self, client_regtest_scrubbed, session - ): - client = client_regtest_scrubbed - path = os.path.join( - CONTRACT_PATH, 'mini_scenarios', 'self_address_sender.tz' - ) - originate(client, session, path, 'Unit', 0) - - def test_self_address_originate_receiver( - self, client_regtest_scrubbed, session - ): - client = client_regtest_scrubbed - path = os.path.join( - CONTRACT_PATH, 'mini_scenarios', 'self_address_receiver.tz' - ) - originate(client, session, path, 'Unit', 0) - session['receiver_address'] = session['contract'] - - def test_send_self_address(self, client_regtest_scrubbed, session): - client = client_regtest_scrubbed - receiver_address = session['receiver_address'] - client.transfer( - 0, - 'bootstrap2', - 'self_address_sender', - ['--arg', f'"{receiver_address}"', '--burn-cap', '2'], - ) - utils.bake(client, 'bootstrap5') - - @pytest.mark.slow @pytest.mark.contract @pytest.mark.regression -- GitLab From 368da54d8f051392b95f1c1d4c94a230f8648b35 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 5 Oct 2022 15:50:29 +0200 Subject: [PATCH 2/3] Pytests: del SelfAddressTransfer in tests_015/test_contract.py (!6382) --- tests_python/tests_015/test_contract.py | 26 ------------------------- 1 file changed, 26 deletions(-) diff --git a/tests_python/tests_015/test_contract.py b/tests_python/tests_015/test_contract.py index 126a99721866..ca93e97d4084 100644 --- a/tests_python/tests_015/test_contract.py +++ b/tests_python/tests_015/test_contract.py @@ -2223,32 +2223,6 @@ code {{ ) -@pytest.mark.incremental -@pytest.mark.contract -@pytest.mark.regression -class TestOriginateContractFromContract: - def test_originate_contract_from_contract_origination( - self, client_regtest_scrubbed, session - ): - client = client_regtest_scrubbed - path = os.path.join( - CONTRACT_PATH, 'mini_scenarios', 'originate_contract.tz' - ) - originate(client, session, path, 'Unit', 200) - - def test_originate_contract_from_contract_transfer( - self, client_regtest_scrubbed - ): - client = client_regtest_scrubbed - client.transfer( - 0, - 'bootstrap2', - 'originate_contract', - ['--arg', 'Unit', '--burn-cap', '2'], - ) - utils.bake(client, 'bootstrap5') - - @pytest.mark.incremental @pytest.mark.contract @pytest.mark.regression -- GitLab From b1aba43b350f01c06427823b13ce04a77d7ac270 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 5 Oct 2022 15:51:40 +0200 Subject: [PATCH 3/3] Pytests: del ticket tests in tests_015/test_contract.py (!6105) --- tests_python/tests_015/test_contract.py | 107 ------------------------ 1 file changed, 107 deletions(-) diff --git a/tests_python/tests_015/test_contract.py b/tests_python/tests_015/test_contract.py index ca93e97d4084..6fe671bee951 100644 --- a/tests_python/tests_015/test_contract.py +++ b/tests_python/tests_015/test_contract.py @@ -2221,110 +2221,3 @@ code {{ self.check_contract_ko( client, kt1, None, root_type, type_mismatch_error ) - - -@pytest.mark.incremental -@pytest.mark.contract -@pytest.mark.regression -class TestCreateRemoveTickets: - def test_add_clear_tickets_origination( - self, client_regtest_scrubbed, session - ): - client = client_regtest_scrubbed - path = os.path.join( - CONTRACT_PATH, 'mini_scenarios', 'add_clear_tickets.tz' - ) - originate(client, session, path, '{}', 200) - - def test_add_clear_tickets_add_first_transfer( - self, client_regtest_scrubbed - ): - client = client_regtest_scrubbed - client.transfer( - 0, - 'bootstrap2', - 'add_clear_tickets', - ['--entrypoint', 'add', '--arg', 'Pair 1 "A"', '--burn-cap', '2'], - ) - utils.bake(client, 'bootstrap5') - - def test_add_clear_tickets_clear_transfer(self, client_regtest_scrubbed): - client = client_regtest_scrubbed - client.transfer( - 0, - 'bootstrap2', - 'add_clear_tickets', - ['--entrypoint', 'clear', '--arg', 'Unit', '--burn-cap', '2'], - ) - utils.bake(client, 'bootstrap5') - - def test_add_clear_tickets_add_second_transfer( - self, client_regtest_scrubbed - ): - client = client_regtest_scrubbed - client.transfer( - 0, - 'bootstrap2', - 'add_clear_tickets', - ['--entrypoint', 'add', '--arg', 'Pair 1 "B"', '--burn-cap', '2'], - ) - utils.bake(client, 'bootstrap5') - - def test_add_clear_tickets_add_third_transfer( - self, client_regtest_scrubbed - ): - client = client_regtest_scrubbed - client.transfer( - 0, - 'bootstrap2', - 'add_clear_tickets', - ['--entrypoint', 'add', '--arg', 'Pair 1 "C"', '--burn-cap', '2'], - ) - utils.bake(client, 'bootstrap5') - - -# This test originates two contracts. One for receiving a big-map with string -# tickets. Another for creating and sending a big-map with string tickets. -# Scanning the big-map for tickets uses the function [Big_map.list_key_values] -# so the regression tests include gas costs associated with calling this -# function. -@pytest.mark.incremental -@pytest.mark.contract -@pytest.mark.regression -class TestSendTicketsInBigMap: - def test_receive_tickets_in_big_map_originate( - self, client_regtest_scrubbed, session - ): - client = client_regtest_scrubbed - path = os.path.join( - CONTRACT_PATH, 'mini_scenarios', 'receive_tickets_in_big_map.tz' - ) - originate(client, session, path, '{}', 200) - session['receiver_address'] = session['contract'] - - def test_send_tickets_in_big_map_originate( - self, client_regtest_scrubbed, session - ): - client = client_regtest_scrubbed - path = os.path.join( - CONTRACT_PATH, 'mini_scenarios', 'send_tickets_in_big_map.tz' - ) - originate(client, session, path, 'Unit', 200) - - def test_send_tickets_in_big_map(self, client_regtest_scrubbed, session): - receiver_address = session['receiver_address'] - client = client_regtest_scrubbed - client.transfer( - 0, - 'bootstrap2', - 'send_tickets_in_big_map', - [ - '--arg', - f'"{receiver_address}"', - '--burn-cap', - '30', - '-storage-limit', - '1000000', - ], - ) - utils.bake(client, 'bootstrap5') -- GitLab