setter for default_account and core tests

Author: billbsing

tests/core/contracts/test_contract_transact_interface.py

@@ -155,29 +155,29 @@ def test_transacting_with_contract_with_arguments(web3,
 def test_deploy_when_default_account_is_set(web3,
                                             wait_for_transaction,
                                             STRING_CONTRACT):
-    web3.eth.defaultAccount = web3.eth.accounts[1]
-    assert web3.eth.defaultAccount is not empty
+    web3.eth.default_account = web3.eth.accounts[1]
+    assert web3.eth.default_account is not empty
 
     StringContract = web3.eth.contract(**STRING_CONTRACT)
 
     deploy_txn = StringContract.constructor("Caqalai").transact()
     web3.eth.waitForTransactionReceipt(deploy_txn)
     txn_after = web3.eth.getTransaction(deploy_txn)
-    assert txn_after['from'] == web3.eth.defaultAccount
+    assert txn_after['from'] == web3.eth.default_account
 
 
 def test_transact_when_default_account_is_set(web3,
                                               wait_for_transaction,
                                               math_contract,
                                               transact):
-    web3.eth.defaultAccount = web3.eth.accounts[1]
-    assert web3.eth.defaultAccount is not empty
+    web3.eth.default_account = web3.eth.accounts[1]
+    assert web3.eth.default_account is not empty
 
     txn_hash = transact(contract=math_contract,
                         contract_function='increment')
     wait_for_transaction(web3, txn_hash)
     txn_after = web3.eth.getTransaction(txn_hash)
-    assert txn_after['from'] == web3.eth.defaultAccount
+    assert txn_after['from'] == web3.eth.default_account
 
 
 def test_transacting_with_contract_with_string_argument(web3, string_contract, transact, call):

tests/core/eth-module/test_defaultAccount_api.py

@@ -0,0 +1,70 @@
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def wait_for_first_block(web3, wait_for_block):
+    wait_for_block(web3)
+
+
+def test_uses_default_account_when_set(web3, extra_accounts,
+                                       wait_for_transaction):
+    web3.eth.default_account = extra_accounts[2]
+    assert web3.eth.default_account == extra_accounts[2]
+
+    txn_hash = web3.eth.sendTransaction({
+        "to": extra_accounts[1],
+        "value": 1234,
+    })
+
+    wait_for_transaction(web3, txn_hash)
+
+    txn = web3.eth.getTransaction(txn_hash)
+    assert txn['from'] == extra_accounts[2]
+
+
+def test_uses_defaultAccount_when_set_with_warning(web3, extra_accounts,
+                                                   wait_for_transaction):
+    with pytest.warns(DeprecationWarning):
+        web3.eth.defaultAccount = extra_accounts[2]
+        assert web3.eth.defaultAccount == extra_accounts[2]
+
+    txn_hash = web3.eth.sendTransaction({
+        "to": extra_accounts[1],
+        "value": 1234,
+    })
+
+    wait_for_transaction(web3, txn_hash)
+
+    txn = web3.eth.getTransaction(txn_hash)
+    assert txn['from'] == extra_accounts[2]
+
+
+def test_uses_given_from_address_when_provided(web3, extra_accounts,
+                                               wait_for_transaction):
+    web3.eth.default_account = extra_accounts[2]
+    txn_hash = web3.eth.sendTransaction({
+        "from": extra_accounts[5],
+        "to": extra_accounts[1],
+        "value": 1234,
+    })
+
+    wait_for_transaction(web3, txn_hash)
+
+    txn = web3.eth.getTransaction(txn_hash)
+    assert txn['from'] == extra_accounts[5]
+
+
+def test_uses_given_from_address_when_provided_with_warning(web3, extra_accounts,
+                                                            wait_for_transaction):
+    with pytest.warns(DeprecationWarning):
+        web3.eth.defaultAccount = extra_accounts[2]
+    txn_hash = web3.eth.sendTransaction({
+        "from": extra_accounts[5],
+        "to": extra_accounts[1],
+        "value": 1234,
+    })
+
+    wait_for_transaction(web3, txn_hash)
+
+    txn = web3.eth.getTransaction(txn_hash)
+    assert txn['from'] == extra_accounts[5]

tests/core/eth-module/test_default_account_api.py

@@ -42,7 +42,7 @@ def setup_w3():
     pyevm_backend = PyEVMBackend(genesis_parameters=custom_genesis_params)
     t = EthereumTester(backend=pyevm_backend)
     w3 = Web3(Web3.EthereumTesterProvider(ethereum_tester=t))
-    w3.eth.defaultAccount = w3.eth.accounts[0]
+    w3.eth.default_account = w3.eth.accounts[0]
     w3.eth.defaultContractFactory = LinkableContract
     w3.enable_unstable_package_management_api()
     return w3

tests/core/pm-module/conftest.py

@@ -116,7 +116,7 @@ def ens_setup(deployer):
 @pytest.fixture
 def ens(ens_setup, mocker):
     mocker.patch('web3.middleware.stalecheck._isfresh', return_value=True)
-    ens_setup.web3.eth.defaultAccount = ens_setup.web3.eth.coinbase
+    ens_setup.web3.eth.default_account = ens_setup.web3.eth.coinbase
     ens_setup.web3.enable_unstable_package_management_api()
     return ens_setup
 

tests/core/pm-module/test_ens_integration.py

@@ -24,7 +24,7 @@
 @pytest.fixture
 def fresh_w3():
     w3 = Web3(Web3.EthereumTesterProvider())
-    w3.eth.defaultAccount = w3.eth.accounts[0]
+    w3.eth.default_account = w3.eth.accounts[0]
     w3.eth.defaultContractFactory = LinkableContract
     w3.enable_unstable_package_management_api()
     return w3

tests/core/pm-module/test_registry_integration.py

@@ -220,7 +220,7 @@ def ens_setup():
 @pytest.fixture
 def ens(ens_setup, mocker):
     mocker.patch('web3.middleware.stalecheck._isfresh', return_value=True)
-    ens_setup.web3.eth.defaultAccount = ens_setup.web3.eth.coinbase
+    ens_setup.web3.eth.default_account = ens_setup.web3.eth.coinbase
     return ens_setup
 
 

tests/ens/conftest.py

@@ -78,7 +78,7 @@ def fetch_manifest_path(name, version):
 @pytest.fixture
 def w3():
     w3 = Web3(Web3.EthereumTesterProvider())
-    w3.eth.defaultAccount = w3.eth.accounts[0]
+    w3.eth.default_account = w3.eth.accounts[0]
     return w3
 
 

tests/ethpm/conftest.py

@@ -11,6 +11,7 @@
     cast,
     overload,
 )
+import warnings
 
 from eth_account import (
     Account,
@@ -40,6 +41,7 @@
     Literal,
 )
 from web3._utils.empty import (
+    Empty,
     empty,
 )
 from web3._utils.encoding import (
@@ -104,7 +106,7 @@
 
 class Eth(ModuleV2, Module):
     account = Account()
-    _default_account = empty
+    _default_account: Union[Empty, ChecksumAddress] = empty
     defaultBlock: Literal["latest"] = "latest"  # noqa: E704
     defaultContractFactory: Type[Union[Contract, ConciseContract, ContractCaller]] = Contract  # noqa: E704,E501
     iban = Iban
@@ -198,17 +200,29 @@ def chainId(self) -> int:
         return self.web3.manager.request_blocking(RPC.eth_chainId, [])
 
     @property
-    def default_account(self) -> str:
-        return self.default_account
+    def default_account(self) -> Union[Empty, ChecksumAddress]:
+        return self._default_account
+
+    @default_account.setter
+    def default_account(self, account: Union[Empty, ChecksumAddress]) -> None:
+        self._default_account = account
 
     @property
-    def defaultAccount(self) -> str:
+    def defaultAccount(self) -> Union[Empty, ChecksumAddress]:
         warnings.warn(
             'defaultAccount is deprecated in favor of default_account',
             category=DeprecationWarning,
         )
         return self._default_account
 
+    @defaultAccount.setter
+    def defaultAccount(self, account: Union[Empty, ChecksumAddress]) -> None:
+        warnings.warn(
+            'defaultAccount is deprecated in favor of default_account',
+            category=DeprecationWarning,
+        )
+        self._default_account = account
+
     def block_id_munger(
         self,
         account: Union[Address, ChecksumAddress, ENS],
@@ -443,7 +457,6 @@ def call_munger(
         if block_identifier is None:
             block_identifier = self.defaultBlock
 
-<<<<<<< HEAD
         return (transaction, block_identifier)
 
     call: Method[Callable[..., Union[bytes, bytearray]]] = Method(
@@ -456,14 +469,8 @@ def estimate_gas_munger(
         transaction: TxParams,
         block_identifier: Optional[BlockIdentifier] = None
     ) -> Sequence[Union[TxParams, BlockIdentifier]]:
-        if 'from' not in transaction and is_checksum_address(self.defaultAccount):
-            transaction = assoc(transaction, 'from', self.defaultAccount)
-=======
-    def estimateGas(self, transaction: TxParams, block_identifier: BlockIdentifier=None) -> Wei:
-        # TODO: move to middleware
         if 'from' not in transaction and is_checksum_address(self.default_account):
             transaction = assoc(transaction, 'from', self.default_account)
->>>>>>> 1b792773... eth.defaultAccount to eth.default_account
 
         if block_identifier is None:
             params: Sequence[Union[TxParams, BlockIdentifier]] = [transaction]