Rebase and fix tests

raiden/network/rpc/smartcontract_proxy.py

@@ -43,6 +43,8 @@ def inspect_client_error(val_err: ValueError, eth_node: str) -> ClientErrorInspe
                 return ClientErrorInspectResult.INSUFFICIENT_FUNDS
             elif 'always failing transaction' in error['message']:
                 return ClientErrorInspectResult.ALWAYS_FAIL
+            elif error['message'] == 'replacement transaction underpriced':
+                return ClientErrorInspectResult.TRANSACTION_UNDERPRICED
 
     elif eth_node == EthClient.PARITY:
         if error['code'] == -32010 and 'insufficient funds' in error['message']:
@@ -78,7 +80,7 @@ def transact(self, function_name: str, *args, **kargs):
             action = inspect_client_error(e, self.jsonrpc_client.eth_node)
             if action == ClientErrorInspectResult.INSUFFICIENT_FUNDS:
                 raise InsufficientFunds('Insufficient ETH for transaction')
-            elif action == ClienErrorInspectResult.TRANSACTION_UNDERPRICED:
+            elif action == ClientErrorInspectResult.TRANSACTION_UNDERPRICED:
                 raise ReplacementTransactionUnderpriced()
 
             raise e

raiden/tests/integration/rpc/test_assumptions.py

@@ -5,6 +5,7 @@
 from eth_utils import decode_hex, to_checksum_address
 from pkg_resources import DistributionNotFound
 
+from raiden.exceptions import ReplacementTransactionUnderpriced
 from raiden.network.rpc.transactions import check_transaction_threw
 from raiden.network.rpc.client import JSONRPCClient
 from raiden.utils.solc import compile_files_cwd
@@ -136,7 +137,7 @@ def test_duplicated_transaction_raises(deploy_client):
 
     gas = contract_proxy.estimate_gas('ret') * 2
 
-    with pytest.raises((ValueError, ValidationError)):
+    with pytest.raises((ReplacementTransactionUnderpriced, ValidationError)):
         second_proxy.transact('ret', startgas=gas)
         contract_proxy.transact('ret', startgas=gas)