Skip to content

Commit e3bc832

Browse files
authored
Merge pull request #1927 from tmckenzie51/tiffany/submitWork-to-snakecase
deprecate submitWork in favor of submit_work
2 parents e6ec888 + 89679ad commit e3bc832

File tree

5 files changed

+23
-6
lines changed

5 files changed

+23
-6
lines changed

docs/web3.eth.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,19 +1140,23 @@ with the filtering API.
11401140
True
11411141
11421142
1143-
.. py:method:: Eth.submitWork(nonce, pow_hash, mix_digest)
1143+
.. py:method:: Eth.submit_work(nonce, pow_hash, mix_digest)
11441144
11451145
* Delegates to ``eth_submitWork`` RPC Method.
11461146

11471147
.. code-block:: python
11481148
1149-
>>> web3.eth.submitWork(
1149+
>>> web3.eth.submit_work(
11501150
1,
11511151
'0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
11521152
'0xD1FE5700000000000000000000000000D1FE5700000000000000000000000000',
11531153
)
11541154
True
11551155
1156+
.. py:method:: Eth.submitWork(nonce, pow_hash, mix_digest)
1157+
1158+
.. warning:: Deprecated: This property is deprecated in favor of
1159+
:attr:`~web3.eth.Eth.submit_work()`
11561160

11571161
Contracts
11581162
---------

newsfragments/1927.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add ``w3.eth.submit_work`` deprecate ``w3.eth.submitWork``

tests/integration/test_ethereum_tester.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@ class TestEthereumTesterEthModule(EthModuleTest):
252252
EthModuleTest.test_eth_sign_transaction_ens_names, ValueError
253253
)
254254
test_eth_submitHashrate = not_implemented(EthModuleTest.test_eth_submitHashrate, ValueError)
255-
test_eth_submitWork = not_implemented(EthModuleTest.test_eth_submitWork, ValueError)
255+
test_eth_submitWork_deprecated = not_implemented(
256+
EthModuleTest.test_eth_submitWork_deprecated, ValueError)
257+
test_eth_submit_work = not_implemented(EthModuleTest.test_eth_submit_work, ValueError)
256258

257259
def test_eth_getBlockByHash_pending(
258260
self, web3: "Web3"

web3/_utils/module_testing/eth_module.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,9 +1476,18 @@ def test_eth_submitHashrate(self, web3: "Web3") -> None:
14761476
result = web3.eth.submitHashrate(5000, node_id)
14771477
assert result is True
14781478

1479-
def test_eth_submitWork(self, web3: "Web3") -> None:
1479+
def test_eth_submit_work(self, web3: "Web3") -> None:
14801480
nonce = 1
14811481
pow_hash = HexStr('0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef')
14821482
mix_digest = HexStr('0xD1FE5700000000000000000000000000D1FE5700000000000000000000000000')
1483-
result = web3.eth.submitWork(nonce, pow_hash, mix_digest)
1483+
result = web3.eth.submit_work(nonce, pow_hash, mix_digest)
1484+
assert result is False
1485+
1486+
def test_eth_submitWork_deprecated(self, web3: "Web3") -> None:
1487+
nonce = 1
1488+
pow_hash = HexStr('0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef')
1489+
mix_digest = HexStr('0xD1FE5700000000000000000000000000D1FE5700000000000000000000000000')
1490+
with pytest.warns(DeprecationWarning,
1491+
match="submitWork is deprecated in favor of submit_work"):
1492+
result = web3.eth.submitWork(nonce, pow_hash, mix_digest)
14841493
assert result is False

web3/eth.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ def filter_munger(
614614
mungers=[default_root_munger],
615615
)
616616

617-
submitWork: Method[Callable[[int, _Hash32, _Hash32], bool]] = Method(
617+
submit_work: Method[Callable[[int, _Hash32, _Hash32], bool]] = Method(
618618
RPC.eth_submitWork,
619619
mungers=[default_root_munger],
620620
)
@@ -689,6 +689,7 @@ def setGasPriceStrategy(self, gas_price_strategy: GasPriceStrategy) -> None:
689689
getUncleCount = DeprecatedMethod(get_uncle_count, 'getUncleCount', 'get_uncle_count')
690690
sendTransaction = DeprecatedMethod(send_transaction, 'sendTransaction', 'send_transaction')
691691
signTransaction = DeprecatedMethod(sign_transaction, 'signTransaction', 'sign_transaction')
692+
submitWork = DeprecatedMethod(submit_work, 'submitWork', 'submit_work')
692693
getLogs = DeprecatedMethod(get_logs, 'getLogs', 'get_logs')
693694
sendRawTransaction = DeprecatedMethod(send_raw_transaction,
694695
'sendRawTransaction',

0 commit comments

Comments
 (0)