pr review

raiden-network · Sep 15, 2017 · 0bcc28d · 0bcc28d
1 parent 9ded682
commit 0bcc28d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/raiden/api/python.py b/raiden/api/python.py
@@ -128,6 +128,7 @@ def connect_token_network(
         try:
             connection_manager = self.raiden.connection_manager_for_token(token_address)
         except InvalidAddress:
+            # token is not yet registered
             self.raiden.chain.default_registry.add_token(token_address)
 
             # wait for registration
@@ -214,7 +215,7 @@ def deposit(self, token_address, partner_address, amount):
         given `token_address` in order to be able to do transfers.
 
         Raises:
-            InvalidAddress: If either token_address or partner_address is not a
+            InvalidAddress: If either token_address or partner_address is not
             20 bytes long.
             TransactionThrew: May happen for multiple reasons:
                 - If the token approval fails, e.g. the token may validate if
@@ -252,7 +253,7 @@ def deposit(self, token_address, partner_address, amount):
         # user spent his balance before deposit.
         balance = token.balance_of(self.raiden.address.encode('hex'))
         if not balance >= amount:
-            msg = "Not enough balance to deposit. {} Available={} Tried={}".format(
+            msg = 'Not enough balance to deposit. {} Available={} Tried={}'.format(
                 pex(token_address),
                 balance,
                 amount,

diff --git a/raiden/channel/netting_channel.py b/raiden/channel/netting_channel.py
@@ -802,7 +802,7 @@ def state_transition(self, state_change):
                     )
                 else:
                     log.warn(
-                        'channel closed on a different block or close event happend twice',
+                        'channel closed on a different block or close event happened twice',
                         channel_address=pex(self.channel_address),
                         closed_block=self.external_state.closed_block,
                         this_block=state_change.block_number

diff --git a/raiden/connection_manager.py b/raiden/connection_manager.py
@@ -14,8 +14,8 @@
     CHANNEL_STATE_SETTLED,
 )
 from raiden.exceptions import (
-    TransactionThrew,
     AddressWithoutCode,
+    TransactionThrew,
 )
 
 log = slogging.get_logger(__name__)  # pylint: disable=invalid-name
@@ -265,8 +265,10 @@ def _open_and_deposit(self, partner, funding_amount):
                     partner,
                     funding_amount,
                 )
-            except (TransactionThrew, AddressWithoutCode):
-                pass
+            except AddressWithoutCode:
+                log.warn('connection manager: channel closed just after it was created')
+            except TransactionThrew:
+                log.exception('connection manager: deposit failed')
 
     def find_new_partners(self, number):
         """Search the token network for potential channel partners.