Make contract address default for createEvent

Author: dylanjw

web3/contract.py

@@ -1027,14 +1027,17 @@ def createFilter(
             fromBlock=None,
             toBlock="latest",
             address=None,
-            topics=dict()):
+            topics=list()):
         """
         Create filter object that tracks logs emitted by this contract event.
         :param filter_params: other parameters to limit the events
         """
         if not fromBlock:
             raise ValueError("Missing mandatory keyword argument to createFilter: fromBlock")
 
+        if not address:
+            address = self.address
+
         _filters = dict(**argument_filters)
 
         data_filter_set, event_filter_params = construct_event_filter_params(

web3/providers/eth_tester/middleware.py

@@ -36,11 +36,11 @@ def is_named_block(value):
     return value in {"latest", "earliest", "pending"}
 
 
-def is_str_is_hex(value):
+def is_hexstr(value):
     return is_string(value) and is_hex(value)
 
 
-to_integer_if_hex = apply_formatter_if(is_str_is_hex, hex_to_integer)
+to_integer_if_hex = apply_formatter_if(is_hexstr, hex_to_integer)
 
 
 is_not_named_block = complement(is_named_block)