Merge pull request #131 from iotaledger/feature/130-fix_getTips_resul…

…t_type Fix result type for `get_tips()`
iotaledger · Jan 6, 2018 · f31c6f7 · f31c6f7
2 parents 3a09bb9 + bc17a0a
commit f31c6f7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/iota/commands/__init__.py b/iota/commands/__init__.py
@@ -18,8 +18,12 @@
 
 __all__ = [
   'BaseCommand',
-  'CustomCommand',
   'command_registry',
+  'discover_commands',
+  'CustomCommand',
+  'FilterCommand',
+  'RequestFilter',
+  'ResponseFilter',
 ]
 
 command_registry = {} # type: Dict[Text, CommandMeta]
@@ -91,7 +95,7 @@ class BaseCommand(with_metaclass(CommandMeta)):
   command = None # Text
 
   def __init__(self, adapter):
-    # type: (BaseAdapter, bool) -> None
+    # type: (BaseAdapter) -> None
     """
     :param adapter:
       Adapter that will send request payloads to the node.

diff --git a/iota/commands/core/get_tips.py b/iota/commands/core/get_tips.py
@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import Address
 from iota.commands import FilterCommand, RequestFilter, ResponseFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionHash
 
 __all__ = [
   'GetTipsCommand',
@@ -42,7 +42,7 @@ def __init__(self):
           f.Array
         | f.FilterRepeater(
               f.ByteString(encoding='ascii')
-            | Trytes(result_type=Address)
+            | Trytes(result_type=TransactionHash)
           )
       ),
     })
diff --git a/test/commands/core/get_tips_test.py b/test/commands/core/get_tips_test.py
@@ -6,9 +6,11 @@
 
 import filters as f
 from filters.test import BaseFilterTestCase
+
 from iota import Address, Iota
 from iota.adapter import MockAdapter
 from iota.commands.core.get_tips import GetTipsCommand
+from iota.transaction.types import TransactionHash
 
 
 class GetTipsRequestFilterTestCase(BaseFilterTestCase):
@@ -123,3 +125,28 @@ def test_wireup(self):
       Iota(self.adapter).getTips,
       GetTipsCommand,
     )
+
+  def test_type_coercion(self):
+    """
+    The result is coerced to the proper type.
+
+    https://github.com/iotaledger/iota.lib.py/issues/130
+    """
+    # noinspection SpellCheckingInspection
+    self.adapter.seed_response('getTips', {
+      'duration': 42,
+      'hashes': [
+        'TESTVALUE9DONTUSEINPRODUCTION99999ANSVWB'
+        'CZ9ABZYUK9YYXFRLROGMCMQHRARDQPNMHHZSZ9999',
+
+        'TESTVALUE9DONTUSEINPRODUCTION99999HCZURL'
+        'NFWEDRFCYHWTYGUEMJLJ9ZIJTFASAVSEAZJGA9999',
+      ],
+    })
+
+    gt_response = Iota(self.adapter).get_tips()
+
+    self.assertEqual(
+      list(map(type, gt_response['hashes'])),
+      [TransactionHash] * 2,
+    )