improve & simplify unit tests Env settings

Author: ViktorYastrebov

tests/test_config.py

@@ -1,6 +1,22 @@
-ZKSYNC_TEST_URL = "https://zksync2-testnet.zksync.dev"
-ETH_TEST_URL = "https://rpc.ankr.com/eth_goerli"
-# ZKSYNC_TEST_URL = "http://127.0.0.1:3050"
-# ETH_TEST_URL = "http://127.0.0.1:8545"
+from dataclasses import dataclass
+from enum import IntEnum, auto
+
 PRIVATE_KEY2 = bytes.fromhex("fd1f96220fa3a40c46d65f81d61dd90af600746fd47e5c82673da937a48b38ef")
 PRIVATE_KEY_BOB = bytes.fromhex("ba6852a8a14cd3c72f6cab8c08f70d033d5d1a56646ab04b4cf54c01cb7204dc")
+
+
+class EnvType(IntEnum):
+    LOCAL_HOST = auto()
+    TESTNET = auto()
+    UNKNOWN = auto()
+
+
+@dataclass
+class TestEnvironment:
+    type: EnvType
+    zksync_server: str
+    eth_server: str
+
+
+LOCAL_ENV = TestEnvironment(EnvType.LOCAL_HOST, "http://127.0.0.1:3050", "http://127.0.0.1:8545")
+TESTNET = TestEnvironment(EnvType.TESTNET, "https://zksync2-testnet.zksync.dev", "https://rpc.ankr.com/eth_goerli")

tests/test_paymaster.py

@@ -135,7 +135,7 @@ def build_paymaster(self, trans: TxFunctionCall, fee: int) -> TxFunctionCall:
                                                                   paymaster_input=encoded_approval_bin)
         return trans
 
-    # @skip("Integration test, paymaster params test not implemented yet")
+    @skip("Integration test, paymaster params test not implemented yet")
     def test_send_funds_with_paymaster(self):
         gas_price = self.web3.zksync.gas_price
         paymaster_address = self.paymaster_address

tests/test_zksync_web3.py

@@ -19,7 +19,7 @@
 from zksync2.signer.eth_signer import PrivateKeyEthSigner
 from tests.contracts.utils import contract_path
 from zksync2.transaction.transaction_builders import TxFunctionCall, TxCreateContract, TxCreate2Contract, TxWithdraw
-from test_config import ZKSYNC_TEST_URL, ETH_TEST_URL, PRIVATE_KEY2, PRIVATE_KEY_BOB
+from test_config import LOCAL_ENV, PRIVATE_KEY2, PRIVATE_KEY_BOB, EnvType
 
 
 def generate_random_salt() -> bytes:
@@ -31,20 +31,19 @@ class ZkSyncWeb3Tests(TestCase):
     ETH_TEST_NET_AMOUNT_BALANCE = Decimal(1)
 
     def setUp(self) -> None:
-        self.web3 = ZkSyncBuilder.build(ZKSYNC_TEST_URL)
+        self.env = LOCAL_ENV
+        self.web3 = ZkSyncBuilder.build(self.env.zksync_server)
         self.account: LocalAccount = Account.from_key(PRIVATE_KEY2)
         self.chain_id = self.web3.zksync.chain_id
         self.signer = PrivateKeyEthSigner(self.account, self.chain_id)
         self.counter_address = None
         self.test_tx_hash = None
         # INFO: use deploy_erc20_token_builder to get new address
-        # self.some_erc20_address = Web3.to_checksum_address("0x37b96512962FC7773E06237116BE693Eb2b3cD51")
-        self.some_erc20_address = Web3.to_checksum_address("0xd782e03F4818A7eDb0bc5f70748F67B4e59CdB33")
-        # https://goerli.explorer.zksync.io/address/0xd782e03F4818A7eDb0bc5f70748F67B4e59CdB33#contract
-        # Mint from site:
-        # https://goerli.explorer.zksync.io/tx/0xad2f582bed2ca5a35db47db21f0dc06eba29273531abc1bc32b8a9112520a3d2
-        # https://goerli.explorer.zksync.io/tx/0x7b34f26f92eb86e5d0e0f5afd19dd279de90d771b38a9e5f7efb26d791b52423
-
+        if self.env.type == EnvType.LOCAL_HOST:
+            self.some_erc20_address = Web3.to_checksum_address("0x37b96512962FC7773E06237116BE693Eb2b3cD51")
+        if self.env.type == EnvType.TESTNET:
+            # https://goerli.explorer.zksync.io/address/0xd782e03F4818A7eDb0bc5f70748F67B4e59CdB33#contract
+            self.some_erc20_address = Web3.to_checksum_address("0xd782e03F4818A7eDb0bc5f70748F67B4e59CdB33")
         self.ERC20_Token = Token(l1_address=ADDRESS_DEFAULT,
                                  l2_address=self.some_erc20_address,
                                  symbol="SERC20",
@@ -53,7 +52,7 @@ def setUp(self) -> None:
     @skip("Integration test, used for develop purposes only")
     def test_send_money(self):
         gas_limit = 21000
-        web3 = Web3(Web3.HTTPProvider(ETH_TEST_URL))
+        web3 = Web3(Web3.HTTPProvider(self.env.eth_server))
         web3.middleware_onion.inject(geth_poa_middleware, layer=0)
         account = web3.eth.accounts[0]
         transaction: TxParams = {
@@ -72,7 +71,7 @@ def test_get_l1_balance(self):
         """
         INFO: For minting use: https://goerli-faucet.pk910.de
         """
-        eth_web3 = Web3(Web3.HTTPProvider(ETH_TEST_URL))
+        eth_web3 = Web3(Web3.HTTPProvider(self.env.eth_server))
         eth_balance = eth_web3.eth.get_balance(self.account.address)
         print(f"Eth: balance: {Web3.from_wei(eth_balance, 'ether')}")
         self.assertNotEqual(eth_balance, 0)
@@ -226,7 +225,7 @@ def mint_some_erc20(self, amount: int):
         nonce = self.web3.zksync.get_transaction_count(self.account.address, EthBlockParams.LATEST.value)
         gas_price = self.web3.zksync.gas_price
 
-        args = (self.account.address, amount)
+        args = (self.account.address, self.ERC20_Token.to_int(amount))
         call_data = some_erc20_encoder.encode_method(fn_name='mint', args=args)
         func_call = TxFunctionCall(chain_id=self.chain_id,
                                    nonce=nonce,
@@ -348,7 +347,7 @@ def test_estimate_gas_withdraw(self):
     # @skip("Integration test, used for develop purposes only")
     def test_withdraw(self):
         amount = 0.1
-        eth_web3 = Web3(Web3.HTTPProvider(ETH_TEST_URL))
+        eth_web3 = Web3(Web3.HTTPProvider(self.env.eth_server))
         eth_web3.middleware_onion.inject(geth_poa_middleware, layer=0)
 
         eth_balance = eth_web3.eth.get_balance(self.account.address)