Merge pull request #66 from prestwich/master

bugfix for equality operator

riemann/simple.py

@@ -297,7 +297,8 @@ def witness_tx(tx_ins, tx_outs, tx_witnesses):
     deser = [script_ser.deserialize(tx_in.redeem_script) for tx_in in tx_ins
              if tx_in is not None]
     try:
-        deser += [script_ser.deserialize(w.stack[::-1]) for w in tx_witnesses]
+        deser += [script_ser.deserialize(w.stack[-1].to_bytes())
+                  for w in tx_witnesses]
     except NotImplementedError:
         pass
     version = max([guess_version(d) for d in deser])

riemann/tests/tx/test_tx.py

@@ -64,6 +64,15 @@ def test_hex(self):
 
         self.assertEqual(bd.hex(), t.hex())
 
+    def test_ne_error(self):
+        with self.assertRaises(TypeError) as context:
+            bd = tx.ByteData()
+            bd == 'hello world'
+
+        self.assertIn(
+            'Equality not supported for ByteData and ',
+            str(context.exception))
+
 
 class TestVarInt(unittest.TestCase):
 

riemann/tx/tx.py

@@ -56,6 +56,9 @@ def __ne__(self, other):
             return self._bytes != other
         elif isinstance(other, ByteData):
             return self._bytes != other._bytes
+        else:
+            raise TypeError('Equality not supported for ByteData and {}.'
+                            .format(type(other)))
 
     def __eq__(self, other):
         '''

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='riemann-tx',
-    version='0.10.1',
+    version='0.10.2',
     description=('Transaction creation library for Bitcoin-like coins'),
     url='https://github.com/summa-tx/riemann',
     author='James Prestwich',