Add smoke tests for deprecated sha3 function

Author: dylanjw

tests/core/web3-module/test_sha3.py

@@ -20,6 +20,18 @@ def test_keccak_text(message, digest):
     assert Web3.keccak(text=message) == digest
 
 
+@pytest.mark.parametrize(
+    'message, digest',
+    [
+        ('cowmö', HexBytes('0x0f355f04c0a06eebac1d219b34c598f85a1169badee164be8a30345944885fe8')),
+        ('', HexBytes('0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470')),
+    ],
+)
+def test_sha3_text(message, digest):
+    with pytest.deprecated_call():
+        assert Web3.sha3(text=message) == digest
+
+
 @pytest.mark.parametrize(
     'hexstr, digest',
     [
@@ -45,6 +57,32 @@ def test_keccak_hexstr(hexstr, digest):
     assert Web3.keccak(hexstr=hexstr) == digest
 
 
+@pytest.mark.parametrize(
+    'hexstr, digest',
+    [
+        (
+            '0x636f776dc3b6',
+            HexBytes('0x0f355f04c0a06eebac1d219b34c598f85a1169badee164be8a30345944885fe8')
+        ),
+        (
+            '636f776dc3b6',
+            HexBytes('0x0f355f04c0a06eebac1d219b34c598f85a1169badee164be8a30345944885fe8')
+        ),
+        (
+            '0x',
+            HexBytes('0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470')
+        ),
+        (
+            '',
+            HexBytes('0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470')
+        ),
+    ],
+)
+def test_sha3_hexstr(hexstr, digest):
+    with pytest.deprecated_call():
+        assert Web3.sha3(hexstr=hexstr) == digest
+
+
 @pytest.mark.parametrize(
     'primitive, exception',
     [

web3/main.py

@@ -133,21 +133,10 @@ def providers(self, providers):
         self.manager.providers = providers
 
     @staticmethod
-    @deprecated_for("This method has been renamed to web3.keccak")
+    @deprecated_for("This method has been renamed to keccak")
     @apply_to_return_value(HexBytes)
     def sha3(primitive=None, text=None, hexstr=None):
-        if isinstance(primitive, (bytes, int, type(None))):
-            input_bytes = to_bytes(primitive, hexstr=hexstr, text=text)
-            return eth_utils_keccak(input_bytes)
-
-        raise TypeError(
-            "You called sha3 with first arg %r and keywords %r. You must call it with one of "
-            "these approaches: sha3(text='txt'), sha3(hexstr='0x747874'), "
-            "sha3(b'\\x74\\x78\\x74'), or sha3(0x747874)." % (
-                primitive,
-                {'text': text, 'hexstr': hexstr}
-            )
-        )
+        return Web3.keccak(primitive, text, hexstr)
 
     @staticmethod
     @apply_to_return_value(HexBytes)