Remove TESTNET2 support (#1185)

* remove testnet2

* satisfy codecov

* update migration guide

* fix migration guide

Author: tomek0123456789

docs/migration_guide.rst

@@ -1,6 +1,34 @@
 Migration guide
 ===============
 
+**********************
+0.18.3 Migration guide
+**********************
+
+Version 0.18.3 of **starknet.py** comes with support for ...
+
+
+0.18.3 Targeted versions
+------------------------
+
+- Starknet - `0.12.2 <https://community.starknet.io/t/introducing-p2p-authentication-and-mismatch-resolution-in-v0-12-2/97993>`_
+- RPC - `0.4.0 <https://github.com/starkware-libs/starknet-specs/releases/tag/v0.4.0>`_
+
+
+0.18.3 Breaking changes
+-----------------------
+
+1. Support for ``TESTNET2`` network has been removed.
+
+
+|
+
+.. raw:: html
+
+  <hr>
+
+|
+
 **********************
 0.18.2 Migration guide
 **********************

starknet_py/net/account/account.py

@@ -464,7 +464,7 @@ async def deploy_account(
 
         Provided address must be first prefunded with enough tokens, otherwise the method will fail.
 
-        If using Client for either TESTNET, TESTNET2 or MAINNET, this method will verify if the address balance
+        If using Client for either TESTNET or MAINNET, this method will verify if the address balance
         is high enough to cover deployment costs.
 
         :param address: calculated and prefunded address of the new account.
@@ -517,7 +517,6 @@ async def deploy_account(
 
         if chain in (
             StarknetChainId.TESTNET,
-            StarknetChainId.TESTNET2,
             StarknetChainId.MAINNET,
         ):
             balance = await account.get_balance()
@@ -537,7 +536,6 @@ def _default_token_address_for_chain(
     ) -> str:
         if (chain_id or self._chain_id) not in [
             StarknetChainId.TESTNET,
-            StarknetChainId.TESTNET2,
             StarknetChainId.MAINNET,
         ]:
             raise ValueError(

starknet_py/net/account/account_test.py

@@ -7,13 +7,13 @@
 from starknet_py.net.full_node_client import FullNodeClient
 from starknet_py.net.gateway_client import GatewayClient
 from starknet_py.net.models import StarknetChainId, parse_address
-from starknet_py.net.networks import MAINNET, TESTNET, TESTNET2
+from starknet_py.net.networks import MAINNET, TESTNET
 from starknet_py.net.signer.stark_curve_signer import KeyPair, StarkCurveSigner
 from starknet_py.tests.e2e.fixtures.constants import MAX_FEE
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize("net", (TESTNET, TESTNET2, MAINNET))
+@pytest.mark.parametrize("net", (TESTNET, MAINNET))
 @pytest.mark.parametrize(
     "call_contract",
     [

starknet_py/net/models/chains.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 from starknet_py.common import int_from_bytes
-from starknet_py.net.networks import MAINNET, TESTNET, TESTNET2, Network
+from starknet_py.net.networks import MAINNET, TESTNET, Network
 
 
 class StarknetChainId(IntEnum):
@@ -12,7 +12,6 @@ class StarknetChainId(IntEnum):
 
     MAINNET = int_from_bytes(b"SN_MAIN")
     TESTNET = int_from_bytes(b"SN_GOERLI")
-    TESTNET2 = int_from_bytes(b"SN_GOERLI2")
 
 
 def chain_from_network(
@@ -21,7 +20,6 @@ def chain_from_network(
     mapping = {
         MAINNET: StarknetChainId.MAINNET,
         TESTNET: StarknetChainId.TESTNET,
-        TESTNET2: StarknetChainId.TESTNET2,
     }
 
     if isinstance(net, str) and net in mapping:

starknet_py/net/networks.py

@@ -4,11 +4,7 @@
 
 MAINNET = "mainnet"
 TESTNET = "testnet"
-# TODO (#1178): remove that
-TESTNET2 = "testnet2"
-
-# TODO (#1178): remove that
-PredefinedNetwork = Literal["mainnet", "testnet", "testnet2"]
+PredefinedNetwork = Literal["mainnet", "testnet"]
 
 
 class CustomGatewayUrls(TypedDict):
@@ -23,14 +19,11 @@ def net_address_from_net(net: str) -> str:
     return {
         MAINNET: "https://alpha-mainnet.starknet.io",
         TESTNET: "https://alpha4.starknet.io",
-        # TODO (#1178): remove that
-        TESTNET2: "https://alpha4-2.starknet.io",
     }.get(net, net)
 
 
 def default_token_address_for_network(net: Network) -> str:
-    # TODO (#1178): remove that
-    if net not in [TESTNET, TESTNET2, MAINNET]:
+    if net not in [TESTNET, MAINNET]:
         raise ValueError(
             "Argument token_address must be specified when using a custom net address"
         )

starknet_py/tests/e2e/client/gateway_test.py

@@ -15,7 +15,7 @@
     TransactionStatusResponse,
 )
 from starknet_py.net.gateway_client import GatewayClient
-from starknet_py.net.networks import MAINNET, TESTNET, TESTNET2, CustomGatewayUrls
+from starknet_py.net.networks import MAINNET, TESTNET, CustomGatewayUrls
 
 
 @pytest.mark.asyncio
@@ -110,8 +110,6 @@ def test_gateway_client_warn_deprecation():
     "net, net_address",
     (
         (TESTNET, "https://alpha4.starknet.io"),
-        # TODO (#1178): remove that
-        (TESTNET2, "https://alpha4-2.starknet.io"),
         (MAINNET, "https://alpha-mainnet.starknet.io"),
     ),
 )

starknet_py/tests/e2e/utils_functions_test.py

@@ -1,7 +1,25 @@
+import pytest
+
+from starknet_py.constants import FEE_CONTRACT_ADDRESS
 from starknet_py.net.full_node_client import _is_valid_eth_address
+from starknet_py.net.networks import default_token_address_for_network
 
 
 def test_is_valid_eth_address():
     assert _is_valid_eth_address("0x333333f332a06ECB5D20D35da44ba07986D6E203")
     assert not _is_valid_eth_address("0x1")
     assert not _is_valid_eth_address("123")
+
+
+def test_default_token_address_for_network():
+    res = default_token_address_for_network("mainnet")
+    assert res == FEE_CONTRACT_ADDRESS
+
+    res = default_token_address_for_network("testnet")
+    assert res == FEE_CONTRACT_ADDRESS
+
+    with pytest.raises(
+        ValueError,
+        match="Argument token_address must be specified when using a custom net address",
+    ):
+        _ = default_token_address_for_network("")