Treat trying to deposit on a closed channel as recoverable error

raiden/api/python.py

@@ -21,6 +21,7 @@
     RaidenRecoverableError,
     TokenNetworkDeprecated,
     TokenNotRegistered,
+    UnexpectedChannelState,
     UnknownTokenAddress,
     WithdrawMismatch,
 )
@@ -571,6 +572,7 @@ def set_total_channel_deposit(
             AddressWithoutCode: The channel was settled during the deposit
                 execution.
             DepositOverLimit: The total deposit amount is higher than the limit.
+            UnexpectedChannelState: The channel is no longer in an open state.
         """
         chain_state = views.state_from_raiden(self.raiden)
 
@@ -642,8 +644,7 @@ def set_total_channel_deposit(
         is_channel_open = channel.get_status(channel_state) == ChannelState.STATE_OPENED
 
         if not is_channel_open:
-            msg = "Channel is not in an open state."
-            raise ValueError(msg)
+            raise UnexpectedChannelState("Channel is not in an open state.")
 
         if safety_deprecation_switch:
             msg = (

raiden/api/rest.py

@@ -78,6 +78,7 @@
     TokenNetworkDeprecated,
     TokenNotRegistered,
     TransactionThrew,
+    UnexpectedChannelState,
     UnknownTokenAddress,
     WithdrawMismatch,
 )
@@ -646,7 +647,7 @@ def open(
                 return api_error(errors=str(e), status_code=HTTPStatus.PAYMENT_REQUIRED)
             except (NonexistingChannel, UnknownTokenAddress) as e:
                 return api_error(errors=str(e), status_code=HTTPStatus.BAD_REQUEST)
-            except (DepositOverLimit, DepositMismatch) as e:
+            except (DepositOverLimit, DepositMismatch, UnexpectedChannelState) as e:
                 return api_error(errors=str(e), status_code=HTTPStatus.CONFLICT)
 
         channel_state = views.get_channelstate_for(
@@ -1092,6 +1093,8 @@ def _deposit(
             return api_error(errors=str(e), status_code=HTTPStatus.CONFLICT)
         except TokenNetworkDeprecated as e:
             return api_error(errors=str(e), status_code=HTTPStatus.CONFLICT)
+        except UnexpectedChannelState as e:
+            return api_error(errors=str(e), status_code=HTTPStatus.CONFLICT)
 
         updated_channel_state = self.raiden_api.get_channel(
             registry_address, channel_state.token_address, channel_state.partner_state.address

raiden/connection_manager.py

@@ -18,6 +18,7 @@
     RaidenRecoverableError,
     RaidenUnrecoverableError,
     TransactionThrew,
+    UnexpectedChannelState,
 )
 from raiden.transfer import views
 from raiden.utils import typing
@@ -30,6 +31,7 @@
     InsufficientFunds,
     RaidenRecoverableError,
     TransactionThrew,
+    UnexpectedChannelState,
 )
 
 

raiden/exceptions.py

@@ -189,6 +189,10 @@ class DuplicatedChannelError(RaidenRecoverableError):
     """Raised if someone tries to create a channel that already exists."""
 
 
+class UnexpectedChannelState(RaidenRecoverableError):
+    """Raised if an operation is attempted on a channel while it is in an unexpected state."""
+
+
 class ContractCodeMismatch(RaidenError):
     """Raised if the onchain code of the contract differs."""
 

raiden/tests/integration/api/test_pythonapi.py

@@ -2,7 +2,12 @@
 from eth_utils import to_checksum_address
 
 from raiden.api.python import RaidenAPI
-from raiden.exceptions import DepositMismatch, TokenNotRegistered, UnknownTokenAddress
+from raiden.exceptions import (
+    DepositMismatch,
+    TokenNotRegistered,
+    UnexpectedChannelState,
+    UnknownTokenAddress,
+)
 from raiden.tests.utils.detect_failure import raise_on_failure
 from raiden.tests.utils.events import must_have_event, wait_for_state_change
 from raiden.tests.utils.transfer import get_channelstate
@@ -205,6 +210,11 @@ def run_test_raidenapi_channel_lifecycle(raiden_network, token_addresses, deposi
     )
     assert channel.get_status(channel12) == ChannelState.STATE_CLOSED
 
+    with pytest.raises(UnexpectedChannelState):
+        api1.set_total_channel_deposit(
+            registry_address, token_address, api2.address, deposit + 100
+        )
+
     assert wait_for_state_change(
         node1.raiden,
         ContractReceiveChannelSettled,