Change sha3 tests to keccak

Author: dylanjw

tests/core/contracts/test_extracting_event_data.py

@@ -123,7 +123,7 @@ def test_dynamic_length_argument_extraction(web3,
     event_topic = emitter_log_topics.LogDynamicArgs
     assert event_topic in log_entry['topics']
 
-    string_0_topic = web3.sha3(text=string_0)
+    string_0_topic = web3.keccak(text=string_0)
     assert string_0_topic in log_entry['topics']
 
     event_data = get_event_data(event_abi, log_entry)

tests/core/contracts/test_extracting_event_data_old.py

@@ -123,7 +123,7 @@ def test_dynamic_length_argument_extraction(web3,
     event_topic = emitter_log_topics.LogDynamicArgs
     assert event_topic in log_entry['topics']
 
-    string_0_topic = web3.sha3(text=string_0)
+    string_0_topic = web3.keccak(text=string_0)
     assert string_0_topic in log_entry['topics']
 
     event_data = get_event_data(event_abi, log_entry)

tests/core/web3-module/test_sha3.py

@@ -16,8 +16,8 @@
         ('', HexBytes('0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470')),
     ],
 )
-def test_sha3_text(message, digest):
-    assert Web3.sha3(text=message) == digest
+def test_keccak_text(message, digest):
+    assert Web3.keccak(text=message) == digest
 
 
 @pytest.mark.parametrize(
@@ -41,8 +41,8 @@ def test_sha3_text(message, digest):
         ),
     ],
 )
-def test_sha3_hexstr(hexstr, digest):
-    assert Web3.sha3(hexstr=hexstr) == digest
+def test_keccak_hexstr(hexstr, digest):
+    assert Web3.keccak(hexstr=hexstr) == digest
 
 
 @pytest.mark.parametrize(
@@ -53,9 +53,9 @@ def test_sha3_hexstr(hexstr, digest):
         (-1, ValueError),
     ],
 )
-def test_sha3_primitive_invalid(primitive, exception):
+def test_keccak_primitive_invalid(primitive, exception):
     with pytest.raises(exception):
-        Web3.sha3(primitive)
+        Web3.keccak(primitive)
 
 
 @pytest.mark.parametrize(
@@ -71,8 +71,8 @@ def test_sha3_primitive_invalid(primitive, exception):
         ),
     ],
 )
-def test_sha3_primitive(primitive, digest):
-    assert Web3.sha3(primitive) == digest
+def test_keccak_primitive(primitive, digest):
+    assert Web3.keccak(primitive) == digest
 
 
 @pytest.mark.parametrize(
@@ -83,17 +83,17 @@ def test_sha3_primitive(primitive, digest):
         {'text': '', 'hexstr': '0x'},
     ],
 )
-def test_sha3_raise_if_primitive_and(kwargs):
+def test_keccak_raise_if_primitive_and(kwargs):
     # must not set more than one input
     with pytest.raises(TypeError):
-        Web3.sha3('', **kwargs)
+        Web3.keccak('', **kwargs)
 
 
-def test_sha3_raise_if_hexstr_and_text():
+def test_keccak_raise_if_hexstr_and_text():
     with pytest.raises(TypeError):
-        Web3.sha3(hexstr='0x', text='')
+        Web3.keccak(hexstr='0x', text='')
 
 
-def test_sha3_raise_if_no_args():
+def test_keccak_raise_if_no_args():
     with pytest.raises(TypeError):
-        Web3.sha3()
+        Web3.keccak()

tests/ens/conftest.py

@@ -107,7 +107,7 @@ def ens_setup():
     ens_key = accounts.pop()
 
     # create ENS contract
-    eth_labelhash = w3.sha3(text='eth')
+    eth_labelhash = w3.keccak(text='eth')
     eth_namehash = bytes32(0x93cdeb708b7545dc668eb9280176169d1c33cfd8ed6f04690a0bcc88a93fc4ae)
     resolver_namehash = bytes32(0xfdd5d5de6dd63db72bbc2d487944ba13bf775b50a80805fe6fcaba9b0fba88f5)
     reverse_tld_namehash = bytes32(0xa097f6721ce401e757d1223a763fef49b8b5f90bb18567ddb86fd205dff71d34)  # noqa: E501
@@ -126,7 +126,7 @@ def ens_setup():
 
     ens_contract.functions.setSubnodeOwner(
         eth_namehash,
-        w3.sha3(text='resolver'),
+        w3.keccak(text='resolver'),
         ens_key
     ).transact({'from': ens_key})
 
@@ -173,13 +173,13 @@ def ens_setup():
     # set 'addr.reverse' to resolve to reverse registrar
     ens_contract.functions.setSubnodeOwner(
         b'\0' * 32,
-        w3.sha3(text='reverse'),
+        w3.keccak(text='reverse'),
         ens_key
     ).transact({'from': ens_key})
 
     ens_contract.functions.setSubnodeOwner(
         reverse_tld_namehash,
-        w3.sha3(text='addr'),
+        w3.keccak(text='addr'),
         ens_key
     ).transact({'from': ens_key})
 
@@ -196,7 +196,7 @@ def ens_setup():
     # set owner of tester.eth to an account controlled by tests
     ens_contract.functions.setSubnodeOwner(
         eth_namehash,
-        w3.sha3(text='tester'),
+        w3.keccak(text='tester'),
         w3.eth.accounts[2]  # note that this does not have to be the default, only in the list
     ).transact({'from': ens_key})
 
@@ -210,7 +210,7 @@ def ens_setup():
     # make the reverse registrar the owner of the 'addr.reverse' name
     ens_contract.functions.setSubnodeOwner(
         reverse_tld_namehash,
-        w3.sha3(text='addr'),
+        w3.keccak(text='addr'),
         reverse_registrar.address
     ).transact({'from': ens_key})