-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Refactor tests
- Loading branch information
Showing
9 changed files
with
73 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,185 +1,35 @@ | ||
| import os | ||
| from typing import List, Optional | ||
|
|
||
| from eth_account import Account | ||
| from eth_typing import ChecksumAddress | ||
| from hexbytes import HexBytes | ||
|
|
||
| from gnosis.eth import EthereumClient | ||
| from gnosis.eth.constants import NULL_ADDRESS | ||
| from gnosis.eth.contracts import get_safe_contract, get_safe_V1_3_0_contract | ||
| from gnosis.safe import ProxyFactory, Safe | ||
| from gnosis.safe.safe_create2_tx import SafeCreate2Tx | ||
| from gnosis.safe.tests.utils import generate_salt_nonce | ||
| from gnosis.safe.tests.safe_test_case import SafeTestCaseMixin | ||
|
|
||
| from safe_cli.operators.safe_operator import SafeOperator | ||
|
|
||
|
|
||
| class SafeCliTestCaseMixin: | ||
| ETHEREUM_NODE_URL: str = os.environ.get( | ||
| "ETHEREUM_NODE_URL", "http://localhost:8545" | ||
| ) | ||
| ETHEREUM_ACCOUNT_KEY: str = "0x4f3edf983ac636a65a842ce7c78d9aa706d3b113bce9c46f30d7d21715b23b1d" # Ganache #0 | ||
|
|
||
| @classmethod | ||
| def setUpClass(cls) -> None: | ||
| cls.ethereum_node_url = cls.ETHEREUM_NODE_URL | ||
| cls.ethereum_client = EthereumClient(cls.ethereum_node_url) | ||
| cls.w3 = cls.ethereum_client.w3 | ||
| cls.ethereum_test_account = Account.from_key(cls.ETHEREUM_ACCOUNT_KEY) | ||
| cls.safe_contract_V1_3_0_address = Safe.deploy_master_contract_v1_3_0( | ||
| cls.ethereum_client, cls.ethereum_test_account | ||
| ).contract_address | ||
| cls.safe_contract_address = Safe.deploy_master_contract_v1_1_1( | ||
| cls.ethereum_client, cls.ethereum_test_account | ||
| ).contract_address | ||
| cls.safe_old_contract_address = Safe.deploy_master_contract_v1_0_0( | ||
| cls.ethereum_client, cls.ethereum_test_account | ||
| ).contract_address | ||
| cls.proxy_factory = ProxyFactory( | ||
| ProxyFactory.deploy_proxy_factory_contract( | ||
| cls.ethereum_client, cls.ethereum_test_account | ||
| ).contract_address, | ||
| cls.ethereum_client, | ||
| ) | ||
|
|
||
| def build_test_safe( | ||
| self, | ||
| number_owners: int = 3, | ||
| threshold: Optional[int] = None, | ||
| owners: Optional[List[str]] = None, | ||
| fallback_handler: Optional[str] = None, | ||
| ) -> SafeCreate2Tx: | ||
| salt_nonce = generate_salt_nonce() | ||
| owners = ( | ||
| owners | ||
| if owners | ||
| else [Account.create().address for _ in range(number_owners)] | ||
| ) | ||
| threshold = threshold if threshold else len(owners) - 1 | ||
|
|
||
| gas_price = self.ethereum_client.w3.eth.gas_price | ||
| return Safe.build_safe_create2_tx( | ||
| self.ethereum_client, | ||
| self.safe_contract_address, | ||
| self.proxy_factory.address, | ||
| salt_nonce, | ||
| owners, | ||
| threshold, | ||
| fallback_handler=fallback_handler, | ||
| gas_price=gas_price, | ||
| payment_token=None, | ||
| fixed_creation_cost=0, | ||
| ) | ||
|
|
||
| def deploy_test_safe( | ||
| self, | ||
| number_owners: int = 3, | ||
| threshold: Optional[int] = None, | ||
| owners: Optional[List[str]] = None, | ||
| initial_funding_wei: int = 0, | ||
| fallback_handler: Optional[str] = None, | ||
| ) -> SafeCreate2Tx: | ||
| owners = ( | ||
| owners | ||
| if owners | ||
| else [Account.create().address for _ in range(number_owners)] | ||
| ) | ||
| if not threshold: | ||
| threshold = len(owners) - 1 if len(owners) > 1 else 1 | ||
| safe_creation_tx = self.build_test_safe( | ||
| threshold=threshold, owners=owners, fallback_handler=fallback_handler | ||
| ) | ||
| funder_account = self.ethereum_test_account | ||
|
|
||
| ethereum_tx_sent = self.proxy_factory.deploy_proxy_contract_with_nonce( | ||
| funder_account, | ||
| self.safe_contract_address, | ||
| safe_creation_tx.safe_setup_data, | ||
| safe_creation_tx.salt_nonce, | ||
| ) | ||
|
|
||
| safe_address = ethereum_tx_sent.contract_address | ||
| if initial_funding_wei: | ||
| self.send_ether(safe_address, initial_funding_wei) | ||
|
|
||
| safe_instance = get_safe_contract(self.w3, safe_address) | ||
|
|
||
| self.assertEqual(safe_instance.functions.getThreshold().call(), threshold) | ||
| self.assertEqual(safe_instance.functions.getOwners().call(), owners) | ||
| self.assertEqual(safe_address, safe_creation_tx.safe_address) | ||
| return safe_creation_tx | ||
|
|
||
| def deploy_test_safe_v1_3_0( | ||
| self, | ||
| number_owners: int = 3, | ||
| threshold: Optional[int] = None, | ||
| owners: Optional[List[ChecksumAddress]] = None, | ||
| initial_funding_wei: int = 0, | ||
| fallback_handler: ChecksumAddress = NULL_ADDRESS, | ||
| ) -> Safe: | ||
| owners = ( | ||
| owners | ||
| if owners | ||
| else [Account.create().address for _ in range(number_owners)] | ||
| ) | ||
| if not threshold: | ||
| threshold = len(owners) - 1 if len(owners) > 1 else 1 | ||
| empty_parameters = {"gas": 1, "gasPrice": 1} | ||
| to = NULL_ADDRESS | ||
| data = b"" | ||
| payment_token = NULL_ADDRESS | ||
| payment = 0 | ||
| payment_receiver = NULL_ADDRESS | ||
| initializer = HexBytes( | ||
| get_safe_V1_3_0_contract(self.w3, address=NULL_ADDRESS) | ||
| .functions.setup( | ||
| owners, | ||
| threshold, | ||
| to, | ||
| data, | ||
| fallback_handler, | ||
| payment_token, | ||
| payment, | ||
| payment_receiver, | ||
| ) | ||
| .build_transaction(empty_parameters)["data"] | ||
| ) | ||
| ethereum_tx_sent = self.proxy_factory.deploy_proxy_contract( | ||
| self.ethereum_test_account, | ||
| self.safe_contract_V1_3_0_address, | ||
| initializer=initializer, | ||
| ) | ||
| safe = Safe(ethereum_tx_sent.contract_address, self.ethereum_client) | ||
| if initial_funding_wei: | ||
| self.send_ether(safe.address, initial_funding_wei) | ||
|
|
||
| self.assertEqual(safe.retrieve_threshold(), threshold) | ||
| self.assertCountEqual(safe.retrieve_owners(), owners) | ||
|
|
||
| return safe | ||
|
|
||
| def setup_operator(self, number_owners: int = 1, version="1.1.1") -> SafeOperator: | ||
| class SafeCliTestCaseMixin(SafeTestCaseMixin): | ||
| def setup_operator(self, number_owners: int = 1, version="1.4.1") -> SafeOperator: | ||
| assert number_owners >= 1, "Number of owners cannot be less than 1!" | ||
| if version == "1.1.1": | ||
| safe_address = self.deploy_test_safe( | ||
| if version == "1.0.0": | ||
| safe = self.deploy_test_safe_v1_0_0( | ||
| owners=[self.ethereum_test_account.address] | ||
| ) | ||
| elif version == "1.1.1": | ||
| safe = self.deploy_test_safe_v1_1_1( | ||
| owners=[self.ethereum_test_account.address] | ||
| ).safe_address | ||
| ) | ||
| elif version == "1.3.0": | ||
| safe_address = self.deploy_test_safe_v1_3_0( | ||
| safe = self.deploy_test_safe_v1_3_0( | ||
| owners=[self.ethereum_test_account.address] | ||
| ) | ||
| elif version == "1.4.1": | ||
| safe = self.deploy_test_safe_v1_4_1( | ||
| owners=[self.ethereum_test_account.address] | ||
| ).address | ||
| ) | ||
| else: | ||
| raise ValueError(f"{version} not supported") | ||
| safe_operator = SafeOperator(safe_address, self.ethereum_node_url) | ||
| safe_operator = SafeOperator(safe.address, self.ethereum_node_url) | ||
| safe_operator.load_cli_owners([self.ethereum_test_account.key.hex()]) | ||
| for _ in range(number_owners - 1): | ||
| account = Account.create() | ||
| safe_operator.add_owner(account.address) | ||
| safe_operator.load_cli_owners([account.key.hex()]) | ||
| return safe_operator | ||
|
|
||
| def send_ether(self, to: str, value: int) -> bytes: | ||
| return self.w3.eth.send_transaction( | ||
| {"to": to, "value": value, "from": self.ethereum_test_account.address} | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.