Cleaned up type hints.

Author: todofixthis

iota/transaction/base.py

@@ -9,9 +9,9 @@
 from iota.codecs import TrytesDecodeError
 from iota.crypto import Curl, HASH_LENGTH
 from iota.json import JsonSerializable
-from iota.transaction.types import BundleHash, Fragment, TransactionHash, \
-  TransactionTrytes, Nonce
-from iota.types import Address, Hash, Tag, TryteString, TrytesCompatible, \
+from iota.transaction.types import BundleHash, Fragment, Nonce, TransactionHash, \
+  TransactionTrytes
+from iota.types import Address, Tag, TryteString, TrytesCompatible, \
   int_from_trits, trits_from_int
 
 __all__ = [
@@ -69,68 +69,67 @@ def from_tryte_string(cls, trytes, hash_=None):
 
   def __init__(
       self,
-      hash_,
-      signature_message_fragment,
-      address,
-      value,
-      timestamp,
-      current_index,
-      last_index,
-      bundle_hash,
-      trunk_transaction_hash,
-      branch_transaction_hash,
-      tag,
-      attachment_timestamp,
-      attachment_timestamp_lower_bound,
-      attachment_timestamp_upper_bound,
-      nonce,
-      legacy_tag = None
+      hash_,                            # type: Optional[TransactionHash]
+      signature_message_fragment,       # type: Optional[Fragment]
+      address,                          # type: Address
+      value,                            # type: int
+      timestamp,                        # type: int
+      current_index,                    # type: Optional[int]
+      last_index,                       # type: Optional[int]
+      bundle_hash,                      # type: Optional[BundleHash]
+      trunk_transaction_hash,           # type: Optional[TransactionHash]
+      branch_transaction_hash,          # type: Optional[TransactionHash]
+      tag,                              # type: Optional[Tag]
+      attachment_timestamp,             # type: Optional[int]
+      attachment_timestamp_lower_bound, # type: Optional[int]
+      attachment_timestamp_upper_bound, # type: Optional[int]
+      nonce,                            # type: Optional[Nonce]
+      legacy_tag = None                 # type: Optional[Tag]
   ):
-    # type: (Optional[TransactionHash], Optional[Fragment], Address, int, int, Optional[int], Optional[int], Optional[BundleHash], Optional[TransactionHash], Optional[TransactionHash], Optional[Tag], Optional[int], Optional[int], Optional[int] Optional[Hash]) -> None
-    self.hash = hash_ # type: Optional[TransactionHash]
+    self.hash = hash_
     """
     Transaction ID, generated by taking a hash of the transaction
     trits.
     """
 
-    self.bundle_hash = bundle_hash # type: Optional[BundleHash]
+    self.bundle_hash = bundle_hash
     """
     Bundle hash, generated by taking a hash of metadata from all the
     transactions in the bundle.
     """
 
-    self.address = address # type: Address
+    self.address = address
     """
     The address associated with this transaction.
     If ``value`` is != 0, the associated address' balance is adjusted
     as a result of this transaction.
     """
 
-    self.value = value # type: int
+    self.value = value
     """
     Amount to adjust the balance of ``address``.
     Can be negative (i.e., for spending inputs).
     """
 
-    self._legacy_tag = legacy_tag # type: Optional[Tag]
+    self._legacy_tag = legacy_tag
     """
     Optional classification legacy_tag applied to this transaction.
     """
 
-    self.nonce = nonce # type: Optional[Nonce]
+    self.nonce = nonce
     """
     Unique value used to increase security of the transaction hash.
     """
 
-    self.timestamp = timestamp # type: int
+    self.timestamp = timestamp
     """
     Timestamp used to increase the security of the transaction hash.
 
     IMPORTANT: This value is easy to forge!
     Do not rely on it when resolving conflicts!
     """
 
-    self.current_index = current_index # type: Optional[int]
+    self.current_index = current_index
     """
     The position of the transaction inside the bundle.
 
@@ -139,12 +138,12 @@ def __init__(
     last.
     """
 
-    self.last_index = last_index # type: Optional[int]
+    self.last_index = last_index
     """
     The position of the final transaction inside the bundle.
     """
 
-    self.trunk_transaction_hash = trunk_transaction_hash # type: Optional[TransactionHash]
+    self.trunk_transaction_hash = trunk_transaction_hash
     """
     In order to add a transaction to the Tangle, you must perform PoW
     to "approve" two existing transactions, called the "trunk" and
@@ -154,27 +153,27 @@ def __init__(
     a bundle.
     """
 
-    self.branch_transaction_hash = branch_transaction_hash # type: Optional[TransactionHash]
+    self.branch_transaction_hash = branch_transaction_hash
     """
     In order to add a transaction to the Tangle, you must perform PoW
     to "approve" two existing transactions, called the "trunk" and
     "branch" transactions.
 
     The branch transaction generally has no significance.
     """
-    
-    self.tag = tag # type: Optional[Tag]
+
+    self.tag = tag
     """
     Optional classification tag applied to this transaction.
     """
-    
-    self.attachment_timestamp = attachment_timestamp # type: int
-    
-    self.attachment_timestamp_lower_bound = attachment_timestamp_lower_bound # type: int
-    
-    self.attachment_timestamp_upper_bound = attachment_timestamp_upper_bound # type: int
 
-    self.signature_message_fragment = signature_message_fragment # type: Optional[Fragment]
+    self.attachment_timestamp = attachment_timestamp
+
+    self.attachment_timestamp_lower_bound = attachment_timestamp_lower_bound
+
+    self.attachment_timestamp_upper_bound = attachment_timestamp_upper_bound
+
+    self.signature_message_fragment = signature_message_fragment
     """
     "Signature/Message Fragment" (note the slash):
 
@@ -246,7 +245,7 @@ def last_index_as_trytes(self):
     """
     # Note that we are padding to 27 _trits_.
     return TryteString.from_trits(trits_from_int(self.last_index, pad=27))
-    
+
   @property
   def attachment_timestamp_as_trytes(self):
     # type: () -> TryteString
@@ -256,7 +255,7 @@ def attachment_timestamp_as_trytes(self):
     """
     #Note that we are padding to 27 _trits_.
     return TryteString.from_trits(trits_from_int(self.attachment_timestamp, pad=27))
-    
+
   @property
   def attachment_timestamp_lower_bound_as_trytes(self):
     # type: () -> TryteString
@@ -266,7 +265,7 @@ def attachment_timestamp_lower_bound_as_trytes(self):
     """
     #Note that we are padding to 27 _trits_.
     return TryteString.from_trits(trits_from_int(self.attachment_timestamp_lower_bound, pad=27))
-    
+
   @property
   def attachment_timestamp_upper_bound_as_trytes(self):
     # type: () -> TryteString
@@ -341,7 +340,7 @@ def get_signature_validation_trytes(self):
       + self.current_index_as_trytes
       + self.last_index_as_trytes
     )
-    
+
   @property
   def legacy_tag(self):
     # type: () -> Tag