fix

Author: serderovsh

tronapi/base/abi.py

@@ -1,3 +1,9 @@
+# --------------------------------------------------------------------
+# Copyright (c) iEXBase. All rights reserved.
+# Licensed under the MIT License.
+# See License.txt in the project root for license information.
+# --------------------------------------------------------------------
+
 import itertools
 import re
 
@@ -380,15 +386,15 @@ def normalizer(datatype, data):
 
 @curry
 def abi_data_tree(types, data):
-    '''
-    Decorate the data tree with pairs of (type, data). The pair tuple is actually an
+    """Decorate the data tree with pairs of (type, data). The pair tuple is actually an
     ABITypedData, but can be accessed as a tuple.
 
-    As an example:
+    Examples:
+        >>> abi_data_tree(types=["bool[2]", "uint"], data=[[True, False], 0])
 
-    >>> abi_data_tree(types=["bool[2]", "uint"], data=[[True, False], 0])
-    [("bool[2]", [("bool", True), ("bool", False)]), ("uint256", 0)]
-    '''
+    Returns:
+        [("bool[2]", [("bool", True), ("bool", False)]), ("uint256", 0)]
+    """
     return [
         abi_sub_tree(data_type, data_value)
         for data_type, data_value

tronapi/base/contracts.py

@@ -1,7 +1,19 @@
+# --------------------------------------------------------------------
+# Copyright (c) iEXBase. All rights reserved.
+# Licensed under the MIT License.
+# See License.txt in the project root for license information.
+# --------------------------------------------------------------------
+
 import functools
 
-from tronapi.base.abi import filter_by_name, filter_by_encodability, filter_by_argument_count, get_fallback_func_abi, \
+from tronapi.base.abi import (
+    filter_by_name,
+    filter_by_encodability,
+    filter_by_argument_count,
+    get_fallback_func_abi,
     abi_to_signature
+)
+
 from tronapi.base.function_identifiers import FallbackFn
 from tronapi.base.toolz import (
     pipe,

tronapi/base/datatypes.py

@@ -1,22 +1,18 @@
+# --------------------------------------------------------------------
+# Copyright (c) iEXBase. All rights reserved.
+# Licensed under the MIT License.
+# See License.txt in the project root for license information.
+# --------------------------------------------------------------------
+
 from tronapi.base.formatters import apply_formatters_to_dict
 from tronapi.base.toolz import (
     concat,
     curry,
 )
 
 
-@curry
-def verify_attr(class_name, key, namespace):
-    if key not in namespace:
-        raise AttributeError(
-            "Property {0} not found on {1} class. "
-            "`{1}.factory` only accepts keyword arguments which are "
-            "present on the {1} class".format(key, class_name)
-        )
-
-
 class PropertyCheckingFactory(type):
-    def __init__(cls, name, bases, namespace, **kargs):
+    def __init__(cls, name, bases, namespace):
         # see PEP487.  To accept kwargs in __new__, they need to be
         # filtered out here.
         super().__init__(name, bases, namespace)
@@ -35,3 +31,13 @@ def __new__(mcs, name, bases, namespace, normalizers=None):
             processed_namespace = namespace
 
         return super().__new__(mcs, name, bases, processed_namespace)
+
+
+@curry
+def verify_attr(class_name, key, namespace):
+    if key not in namespace:
+        raise AttributeError(
+            "Property {0} not found on {1} class. "
+            "`{1}.factory` only accepts keyword arguments which are "
+            "present on the {1} class".format(key, class_name)
+        )

tronapi/base/formatters.py

@@ -1,12 +1,16 @@
+# --------------------------------------------------------------------
+# Copyright (c) iEXBase. All rights reserved.
+# Licensed under the MIT License.
+# See License.txt in the project root for license information.
+# --------------------------------------------------------------------
+
 from collections import Mapping, Iterable
 
 from eth_utils import to_dict
 
 from tronapi.base.decorators import reject_recursive_repeats
 from tronapi.base.toolz import (
-    compose,
-    curry,
-    dissoc,
+    curry
 )
 from tronapi.utils.types import is_string
 

tronapi/base/validation.py

@@ -25,7 +25,7 @@
 
 def _prepare_selector_collision_msg(duplicates):
     dup_sel = valmap(apply_formatter_to_array(abi_to_signature), duplicates)
-    joined_funcs = valmap(lambda funcs: ', '.join(funcs), dup_sel)
+    joined_funcs = valmap(lambda f: ', '.join(f), dup_sel)
     func_sel_msg_list = [funcs + ' have selector ' + sel for sel, funcs in joined_funcs.items()]
     return ' and\n'.join(func_sel_msg_list)
 

tronapi/contract.py

@@ -1,18 +1,39 @@
+# --------------------------------------------------------------------
+# Copyright (c) iEXBase. All rights reserved.
+# Licensed under the MIT License.
+# See License.txt in the project root for license information.
+# --------------------------------------------------------------------
+
 import copy
-from typing import Dict, Any
 
 from eth_utils import function_abi_to_4byte_selector, to_hex
 
-from tronapi.base.abi import filter_by_type, merge_args_and_kwargs, abi_to_signature, get_constructor_abi, \
-    fallback_func_abi_exists, check_if_arguments_can_be_encoded
+from tronapi.base.abi import (
+    filter_by_type,
+    merge_args_and_kwargs,
+    abi_to_signature,
+    fallback_func_abi_exists,
+    check_if_arguments_can_be_encoded
+)
 from tronapi.base.contracts import find_matching_fn_abi
 from tronapi.base.datatypes import PropertyCheckingFactory
-from tronapi.base.decorators import combomethod, deprecated_for
+from tronapi.base.decorators import (
+    combomethod,
+    deprecated_for
+)
 from tronapi.base.encoding import to_4byte_hex
 from tronapi.base.function_identifiers import FallbackFn
-from tronapi.base.normalizers import normalize_abi, normalize_bytecode
-from tronapi.exceptions import NoABIFunctionsFound, MismatchedABI, InvalidAddress, FallbackNotFound
-from tronapi.utils.hexadecimal import encode_hex, add_0x_prefix
+from tronapi.base.normalizers import (
+    normalize_abi,
+    normalize_bytecode
+)
+from tronapi.exceptions import (
+    NoABIFunctionsFound,
+    MismatchedABI,
+    InvalidAddress,
+    FallbackNotFound
+)
+from tronapi.utils.hexadecimal import encode_hex
 from tronapi.utils.types import is_text, is_integer
 
 

tronapi/manager.py

@@ -15,8 +15,6 @@
     :license: MIT License
 """
 
-import logging
-
 from tronapi import HttpProvider
 from tronapi.utils.types import is_string