minor fixes

rainbowadn/chain/reduction/reductionchainmetafactory.py

@@ -20,11 +20,7 @@ class ReductionChainMetaFactory(
     AbstractReductionChainMetaFactory[
         Block[
             ReductorType,
-            StateStage[
+            StateStage[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]]
-                ReductorType,
-                AccumulatorType,
-                Reduction[ReductorType, AccumulatorType]
-            ]
         ],
         ReductorType,
         AccumulatorType
@@ -39,11 +35,7 @@ class ReductionChainMetaFactory(
     ) -> ChainCollectionFactory[
         Block[
             ReductorType,
-            StateStage[
+            StateStage[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]]
-                ReductorType,
-                AccumulatorType,
-                Reduction[ReductorType, AccumulatorType]
-            ]
         ],
         ReductorType,
         AccumulatorType

rainbowadn/chain/reduction/reductionchainprotocol.py

@@ -19,11 +19,7 @@ AccumulatorType = TypeVar('AccumulatorType')
 class ReductionChainProtocol(
     BlockChainProtocol[
         ReductorType,
-        StateStage[
+        StateStage[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]],
-            ReductorType,
-            AccumulatorType,
-            Reduction[ReductorType, AccumulatorType]
-        ],
         AccumulatorType
     ]
 ):

rainbowadn/hashing/reduce_nullable_reference.py

@@ -1,21 +0,0 @@
-from typing import TypeVar
-
-from rainbowadn.hashing.hashpoint import HashPoint
-from rainbowadn.hashing.hashresolver import HashResolver
-from rainbowadn.hashing.nullability.nullablereference import NullableReference
-
-__all__ = ('reduce_nullable_reference',)
-
-ReReferencedType = TypeVar('ReReferencedType')
-
-
-def reduce_nullable_reference(
-        reference: NullableReference[NullableReference[ReReferencedType]],
-        resolver: HashResolver
-) -> NullableReference[ReReferencedType]:
-    assert isinstance(reference, NullableReference)
-    assert isinstance(resolver, HashResolver)
-    if reference.reference.null():
-        return reference.factory.from_bytes(HashPoint.NULL_HASH, resolver)
-    else:
-        return reference.reference.resolve().resolve()

rainbowadn/storage/storage.py

@@ -0,0 +1,2 @@
+class Storage:
+    pass

rainbowadn/testing/test_all.py

@@ -108,6 +108,7 @@ class TestAll(unittest.TestCase):
                 assert not btree.contains(key)
                 btree = btree.add(key)
                 assert btree.contains(key)
+            print(btree.height)
             measure('resolve and add')
 
     def test_wrisbt_index(self):

rainbowadn/v13/transaction.py

@@ -159,10 +159,9 @@ class TransactionData(RecursiveMentionable, StaticMentionable):
             assert isinstance(owner, Subject)
             signature: Signature = signatures_stack.element.resolve()
             assert isinstance(signature, Signature)
-            return signature.verify(
+            assert signature.verify(owner, self.hash_point)
-                owner,
+            assert self._verify_signatures(in_coins_stack.previous, signatures_stack.previous)
-                self.hash_point
+            return True
-            )
 
     def iter_in_coins(self) -> Iterable[HashPoint[Coin]]:
         in_coins: NullableReference[Stack[Coin]] = self.in_coins