hexaddress decoder test

Author: hackaugusto

raiden/api/v1/encoding.py

@@ -35,16 +35,15 @@
 )
 
 
-# type converter for the flask route
 class HexAddressConverter(BaseConverter):
-
     def to_python(self, value):
-        value = address_decoder(value)
-        return value
+        if value[:2] == '0x':
+            return value[2:].decode('hex')
+
+        raise Exception('invalid address')
 
     def to_url(self, value):
-        value = address_encoder(value)
-        return value
+        return address_encoder(value)
 
 
 class AddressField(fields.Field):

raiden/tests/api/test_api.py

@@ -7,6 +7,7 @@
 
 from pyethapp.jsonrpc import address_encoder, address_decoder
 
+from raiden.api.v1.encoding import HexAddressConverter
 from raiden.tests.utils.apitestcontext import decode_response
 from raiden.utils import channel_to_api_dict
 from raiden.tests.utils.transfer import channel
@@ -40,6 +41,25 @@ def api_url_for(api_backend, endpoint, **kwargs):
         return url_for('v1_resources.{}'.format(endpoint), **kwargs)
 
 
+def test_hex_converter():
+    converter = HexAddressConverter(map=None)
+
+    # invalid hex data
+    with pytest.raises(Exception):
+        converter.to_python('-')
+
+    # invalid address, too short
+    with pytest.raises(Exception):
+        converter.to_python('1234')
+
+    # missing prefix 0x
+    with pytest.raises(Exception):
+        converter.to_python('414d72a6f6e28f4950117696081450d63d56c354')
+
+    address = b'AMr\xa6\xf6\xe2\x8fIP\x11v\x96\x08\x14P\xd6=V\xc3T'
+    assert converter.to_python('0x414d72a6f6e28f4950117696081450d63d56c354') == address
+
+
 @pytest.mark.parametrize('blockchain_type', ['geth'])
 @pytest.mark.parametrize('number_of_nodes', [2])
 def test_channel_to_api_dict(raiden_network, token_addresses, settle_timeout):