restructured

rainbowadn/atomic/__init__.py

@@ -0,0 +1,3 @@
+from .atomic import Atomic
+from .integer import Integer
+from .plain import Plain

rainbowadn/atomic/atomic.py

@@ -1,9 +1,7 @@
 import abc
 from typing import Type, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.static import StaticMentionable
 
 __all__ = ('Atomic',)
 

rainbowadn/atomic/integer.py

@@ -1,4 +1,4 @@
-from rainbowadn.data.atomic.atomic import Atomic
+from .atomic import Atomic
 
 __all__ = ('Integer',)
 

rainbowadn/atomic/plain.py

@@ -1,4 +1,4 @@
-from rainbowadn.data.atomic.atomic import Atomic
+from .atomic import Atomic
 
 __all__ = ('Plain',)
 

rainbowadn/chain/__init__.py

@@ -0,0 +1,5 @@
+from .blockchain import *
+from .blockchainprotocol import BlockChainProtocol
+from .chaincollectionfactory import ChainCollectionFactory
+from .chaincollectioninterface import ChainCollectionInterface
+from .reductionchainmetafactory import ReductionChainMetaFactory

rainbowadn/chain/block.py

@@ -1,12 +1,7 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.nullability import *
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.nullability.nullablereference import NullableReference, NullableReferenceFactory
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = ('Block', 'BlockFactory',)
 

rainbowadn/chain/blockchain.py

@@ -1,15 +1,12 @@
 import asyncio
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.block import Block, BlockFactory
+from rainbowadn.core import *
-from rainbowadn.chain.blockchainprotocol import BlockChainProtocol
+from rainbowadn.nullability import *
-from rainbowadn.chain.chaincollectionfactory import ChainCollectionFactory
+from .block import *
-from rainbowadn.chain.chaincollectioninterface import ChainCollectionInterface
+from .blockchainprotocol import BlockChainProtocol
-from rainbowadn.core.asserts import assert_eq, assert_true
+from .chaincollectionfactory import ChainCollectionFactory
-from rainbowadn.core.hashpoint import HashPoint
+from .chaincollectioninterface import ChainCollectionInterface
-from rainbowadn.core.nullability.null import Null
-from rainbowadn.core.nullability.nullablereference import NullableReference
-from rainbowadn.core.rainbow_factory import RainbowFactory
 
 __all__ = ('BlockChain', 'BlockChainFactory',)
 

rainbowadn/chain/blockchainprotocol.py

@@ -1,8 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.states.activestateprotocol import ActiveStateProtocol
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from .states import *
-from rainbowadn.core.rainbow_factory import RainbowFactory
 
 __all__ = ('BlockChainProtocol',)
 

rainbowadn/chain/blockcollectioninterface.py

@@ -1,10 +1,8 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.collection.collectioninterface import CollectionInterface
-from rainbowadn.core.nullability.null import Null
+from rainbowadn.core import *
-from rainbowadn.core.nullability.nullablereference import NullableReference
+from rainbowadn.nullability import *
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.data.collection.collection_interface.collectioninterface import CollectionInterface
 
 __all__ = ('BlockCollectionInterface',)
 

rainbowadn/chain/chaincollectionfactory.py

@@ -1,7 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.chaincollectioninterface import ChainCollectionInterface
+from rainbowadn.nullability import *
-from rainbowadn.core.nullability.nullablereference import NullableReference
+from .chaincollectioninterface import ChainCollectionInterface
 
 __all__ = ('ChainCollectionFactory',)
 

rainbowadn/chain/chaincollectioninterface.py

@@ -1,8 +1,8 @@
 import abc
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.blockcollectioninterface import BlockCollectionInterface
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from .blockcollectioninterface import BlockCollectionInterface
 
 __all__ = ('ChainCollectionInterface',)
 

rainbowadn/chain/derivation/__init__.py

@@ -0,0 +1,5 @@
+from .activestageprotocol import ActiveStageProtocol
+from .activestagestateprotocol import ActiveStageStateProtocol
+from .derived import Derived
+from .derivedstage import DerivedStage
+from .derivedstate import DerivedState

rainbowadn/chain/derivation/activestageprotocol.py

@@ -1,15 +1,11 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.stages.derivation.derived import Derived
+from rainbowadn.chain.stages import *
-from rainbowadn.chain.stages.derivation.derivedstage import DerivedStage
+from rainbowadn.core import *
-from rainbowadn.chain.stages.derivation.derivedstate import DerivedState
+from rainbowadn.nullability import *
-from rainbowadn.chain.stages.stage import StageStage, StageStageFactory, StateStage
+from .derived import Derived
-from rainbowadn.chain.stages.stageprotocol import StageProtocol
+from .derivedstage import DerivedStage
-from rainbowadn.core.asserts import assert_eq
+from .derivedstate import DerivedState
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.nullability.null import Null
-from rainbowadn.core.nullability.nullablereference import NullableReference
-from rainbowadn.core.rainbow_factory import RainbowFactory
 
 __all__ = ('ActiveStageProtocol',)
 

rainbowadn/chain/derivation/activestagestateprotocol.py

@@ -1,11 +1,10 @@
 from typing import TypeVar
 
-from rainbowadn.chain.stages.derivation.activestageprotocol import ActiveStageProtocol
+from rainbowadn.chain.stages import *
-from rainbowadn.chain.stages.stage import StateStage
+from rainbowadn.chain.states import *
-from rainbowadn.chain.states.activestateprotocol import ActiveStateProtocol
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.nullability import *
-from rainbowadn.core.nullability.nullablereference import NullableReference
+from .activestageprotocol import ActiveStageProtocol
-from rainbowadn.core.rainbow_factory import RainbowFactory
 
 __all__ = ('ActiveStageStateProtocol',)
 
@@ -62,3 +61,10 @@ class ActiveStageStateProtocol(
             self.base_state_factory,
             self.stage_factory
         )
+
+    @classmethod
+    def stage_state_protocol(cls) -> StateProtocol[
+        HeaderType,
+        StateStage[HeaderType, BaseStateType, StageType]
+    ]:
+        return StageStateProtocol()

rainbowadn/chain/derivation/derivedstage.py

@@ -1,7 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.stages.derivation.derived import Derived
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from .derived import Derived
 
 __all__ = ('DerivedStage',)
 

rainbowadn/chain/derivation/derivedstate.py

@@ -1,7 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.stages.derivation.derived import Derived
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from .derived import Derived
 
 __all__ = ('DerivedState',)
 

rainbowadn/chain/reduction/__init__.py

@@ -0,0 +1,6 @@
+from .abstractreductionchainmetafactory import AbstractReductionChainMetaFactory
+from .reduced import Reduced
+from .reducible import Reducible
+from .reductionchainprotocol import ReductionChainProtocol
+from .reductionprotocol import ReductionProtocol
+from .reductionresult import ReductionResult

rainbowadn/chain/reduction/abstractreductionchainmetafactory.py

@@ -1,8 +1,8 @@
 from typing import Generic, TypeVar
 
 from rainbowadn.chain.chaincollectionfactory import ChainCollectionFactory
-from rainbowadn.chain.reduction.reductionprotocol import ReductionProtocol
+from rainbowadn.core import *
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .reductionprotocol import ReductionProtocol
 
 __all__ = ('AbstractReductionChainMetaFactory',)
 

rainbowadn/chain/reduction/reduced.py

@@ -1,7 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.reduction.reductionresult import ReductionResult
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from .reductionresult import ReductionResult
 
 __all__ = ('Reduced',)
 

rainbowadn/chain/reduction/reducible.py

@@ -1,20 +1,15 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.chain.reduction.reductionresult import ReductionResult
+from rainbowadn.core import *
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from .reductionresult import ReductionResult
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
-__all__ = ('Reduction', 'ReductionFactory',)
+__all__ = ('Reducible', 'ReductionFactory',)
 
 ReductorType = TypeVar('ReductorType')
 AccumulatorType = TypeVar('AccumulatorType')
 
 
-class Reduction(
+class Reducible(
     ReductionResult[ReductorType, AccumulatorType],
     RecursiveMentionable,
     Generic[ReductorType, AccumulatorType]
@@ -31,7 +26,7 @@ class Reduction(
     def __bytes__(self):
         return bytes(self.reductor) + bytes(self.accumulator)
 
-    def __factory__(self) -> RainbowFactory['Reduction[ReductorType, AccumulatorType]']:
+    def __factory__(self) -> RainbowFactory['Reducible[ReductorType, AccumulatorType]']:
         return ReductionFactory(self.reductor.factory, self.accumulator.factory)
 
     async def str(self, tab: int) -> str:
@@ -41,7 +36,7 @@ class Reduction(
 
 
 class ReductionFactory(
-    RainbowFactory[Reduction[ReductorType, AccumulatorType]],
+    RainbowFactory[Reducible[ReductorType, AccumulatorType]],
     Generic[ReductorType, AccumulatorType]
 ):
     def __init__(
@@ -54,10 +49,10 @@ class ReductionFactory(
         self.reductor_factory = reductor_factory
         self.accumulator_factory = accumulator_factory
 
-    def from_bytes(self, source: bytes, resolver: HashResolver) -> Reduction[ReductorType, AccumulatorType]:
+    def from_bytes(self, source: bytes, resolver: HashResolver) -> Reducible[ReductorType, AccumulatorType]:
         assert isinstance(source, bytes)
         assert isinstance(resolver, HashResolver)
-        return Reduction(
+        return Reducible(
             ResolverOrigin(self.reductor_factory, source[:HashPoint.HASH_LENGTH], resolver).hash_point(),
             ResolverOrigin(self.accumulator_factory, source[HashPoint.HASH_LENGTH:], resolver).hash_point(),
         )

rainbowadn/chain/reduction/reductionchainprotocol.py

@@ -1,14 +1,12 @@
 from typing import TypeVar
 
 from rainbowadn.chain.blockchainprotocol import BlockChainProtocol
-from rainbowadn.chain.reduction.reduction import Reduction, ReductionFactory
+from rainbowadn.chain.derivation import *
-from rainbowadn.chain.reduction.reductionprotocol import ReductionProtocol
+from rainbowadn.chain.stages import *
-from rainbowadn.chain.reduction.reductionstageprotocol import ReductionStageProtocol
+from rainbowadn.core import *
-from rainbowadn.chain.stages.derivation.activestageprotocol import ActiveStageProtocol
+from .reducible import *
-from rainbowadn.chain.stages.derivation.activestagestateprotocol import ActiveStageStateProtocol
+from .reductionprotocol import ReductionProtocol
-from rainbowadn.chain.stages.stage import StateStage, StateStageFactory
+from .reductionstageprotocol import ReductionStageProtocol
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.rainbow_factory import RainbowFactory
 
 __all__ = ('ReductionChainProtocol',)
 
@@ -19,7 +17,7 @@ AccumulatorType = TypeVar('AccumulatorType')
 class ReductionChainProtocol(
     BlockChainProtocol[
         ReductorType,
-        StateStage[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]],
+        StateStage[ReductorType, AccumulatorType, Reducible[ReductorType, AccumulatorType]],
         AccumulatorType
     ]
 ):
@@ -34,7 +32,7 @@ class ReductionChainProtocol(
         assert isinstance(accumulator_factory, RainbowFactory)
 
         reduction_factory: RainbowFactory[
-            Reduction[ReductorType, AccumulatorType]
+            Reducible[ReductorType, AccumulatorType]
         ] = ReductionFactory(
             reductor_factory, accumulator_factory
         )
@@ -42,7 +40,7 @@ class ReductionChainProtocol(
         stage_protocol: ActiveStageProtocol[
             ReductorType,
             AccumulatorType,
-            Reduction[ReductorType, AccumulatorType]
+            Reducible[ReductorType, AccumulatorType]
         ] = ReductionStageProtocol(protocol)
         assert isinstance(stage_protocol, ActiveStageProtocol)
 
@@ -71,7 +69,7 @@ class ReductionChainProtocol(
             state: StateStage[
                 ReductorType,
                 AccumulatorType,
-                Reduction[ReductorType, AccumulatorType]
+                Reducible[ReductorType, AccumulatorType]
             ]
     ) -> HashPoint[AccumulatorType]:
         assert isinstance(state, StateStage)

rainbowadn/chain/reduction/reductionprotocol.py

@@ -1,9 +1,8 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.reduction.reduction import Reduction
+from rainbowadn.core import *
-from rainbowadn.chain.reduction.reductionresult import ReductionResult
+from .reducible import Reducible
-from rainbowadn.core.hashpoint import HashPoint
+from .reductionresult import ReductionResult
-from rainbowadn.core.rainbow_factory import RainbowFactory
 
 __all__ = ('ReductionProtocol',)
 
@@ -14,7 +13,7 @@ AccumulatorType = TypeVar('AccumulatorType')
 class ReductionProtocol(Generic[ReductorType, AccumulatorType]):
     async def reduce(
             self,
-            reduction: Reduction[ReductorType, AccumulatorType]
+            reduce: Reducible[ReductorType, AccumulatorType]
     ) -> ReductionResult[ReductorType, AccumulatorType]:
         raise NotImplementedError
 

rainbowadn/chain/reduction/reductionstageprotocol.py

@@ -1,15 +1,12 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.reduction.reduced import Reduced
+from rainbowadn.chain.derivation import *
-from rainbowadn.chain.reduction.reduction import Reduction
+from rainbowadn.core import *
-from rainbowadn.chain.reduction.reductionprotocol import ReductionProtocol
+from rainbowadn.nullability import *
-from rainbowadn.chain.reduction.reductionresult import ReductionResult
+from .reduced import Reduced
-from rainbowadn.chain.stages.derivation.activestageprotocol import ActiveStageProtocol
+from .reducible import Reducible
-from rainbowadn.chain.stages.derivation.derived import Derived
+from .reductionprotocol import ReductionProtocol
-from rainbowadn.chain.stages.derivation.derivedstage import DerivedStage
+from .reductionresult import ReductionResult
-from rainbowadn.chain.stages.derivation.derivedstate import DerivedState
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.nullability.nullablereference import NullableReference
 
 __all__ = ('ReductionStageProtocol',)
 
@@ -18,7 +15,7 @@ AccumulatorType = TypeVar('AccumulatorType')
 
 
 class ReductionStageProtocol(
-    ActiveStageProtocol[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]],
+    ActiveStageProtocol[ReductorType, AccumulatorType, Reducible[ReductorType, AccumulatorType]],
     Generic[ReductorType, AccumulatorType]
 ):
     def __init__(self, protocol: ReductionProtocol[ReductorType, AccumulatorType]):
@@ -40,11 +37,11 @@ class ReductionStageProtocol(
             self,
             previous: NullableReference[AccumulatorType],
             header: HashPoint[ReductorType]
-    ) -> HashPoint[Reduction[ReductorType, AccumulatorType]]:
+    ) -> HashPoint[Reducible[ReductorType, AccumulatorType]]:
         assert isinstance(previous, NullableReference)
         assert isinstance(header, HashPoint)
         return HashPoint.of(
-            Reduction(
+            Reducible(
                 header,
                 await self._derive_accumulator(previous)
             )
@@ -54,9 +51,9 @@ class ReductionStageProtocol(
     def _derived_from_reduced(
             cls,
             reduced: ReductionResult[ReductorType, AccumulatorType]
-    ) -> Derived[ReductorType, Reduction[ReductorType, AccumulatorType]]:
+    ) -> Derived[ReductorType, Reducible[ReductorType, AccumulatorType]]:
         assert isinstance(reduced, ReductionResult)
-        if isinstance(reduced, Reduction):
+        if isinstance(reduced, Reducible):
             return DerivedStage(HashPoint.of(reduced))
         elif isinstance(reduced, Reduced):
             return DerivedState(reduced.reduced)
@@ -65,7 +62,7 @@ class ReductionStageProtocol(
 
     async def derive_stage_or_state(
             self,
-            stage: HashPoint[Reduction[ReductorType, AccumulatorType]]
+            stage: HashPoint[Reducible[ReductorType, AccumulatorType]]
-    ) -> Derived[ReductorType, Reduction[ReductorType, AccumulatorType]]:
+    ) -> Derived[ReductorType, Reducible[ReductorType, AccumulatorType]]:
         assert isinstance(stage, HashPoint)
         return self._derived_from_reduced(await self.protocol.reduce(await stage.resolve()))

rainbowadn/chain/reductionchainmetafactory.py

@@ -1,14 +1,11 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.abstractreductionchainmetafactory import AbstractReductionChainMetaFactory
+from rainbowadn.core import *
-from rainbowadn.chain.block import Block
+from .block import Block
-from rainbowadn.chain.blockchain import BlockChainFactory
+from .blockchain import BlockChainFactory
-from rainbowadn.chain.chaincollectionfactory import ChainCollectionFactory
+from .chaincollectionfactory import ChainCollectionFactory
-from rainbowadn.chain.reduction.reduction import Reduction
+from .reduction import *
-from rainbowadn.chain.reduction.reductionchainprotocol import ReductionChainProtocol
+from .stages import *
-from rainbowadn.chain.reduction.reductionprotocol import ReductionProtocol
-from rainbowadn.chain.stages.stage import StateStage
-from rainbowadn.core.rainbow_factory import RainbowFactory
 
 __all__ = ('ReductionChainMetaFactory',)
 
@@ -20,7 +17,7 @@ class ReductionChainMetaFactory(
     AbstractReductionChainMetaFactory[
         Block[
             ReductorType,
-            StateStage[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]]
+            StateStage[ReductorType, AccumulatorType, Reducible[ReductorType, AccumulatorType]]
         ],
         ReductorType,
         AccumulatorType
@@ -35,7 +32,7 @@ class ReductionChainMetaFactory(
     ) -> ChainCollectionFactory[
         Block[
             ReductorType,
-            StateStage[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]]
+            StateStage[ReductorType, AccumulatorType, Reducible[ReductorType, AccumulatorType]]
         ],
         ReductorType,
         AccumulatorType
@@ -54,7 +51,7 @@ class ReductionChainMetaFactory(
     def loose(self) -> AbstractReductionChainMetaFactory[
         Block[
             ReductorType,
-            StateStage[ReductorType, AccumulatorType, Reduction[ReductorType, AccumulatorType]]
+            StateStage[ReductorType, AccumulatorType, Reducible[ReductorType, AccumulatorType]]
         ],
         ReductorType,
         AccumulatorType

rainbowadn/chain/stages/__init__.py

@@ -0,0 +1,3 @@
+from .stageprotocol import StageProtocol
+from .stagestate import *
+from .stagestateprotocol import StageStateProtocol

rainbowadn/chain/stages/stageprotocol.py

@@ -1,7 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
-from rainbowadn.core.nullability.nullablereference import NullableReference
+from rainbowadn.nullability import *
 
 __all__ = ('StageProtocol',)
 

rainbowadn/chain/stages/stagestate.py

@@ -1,15 +1,8 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.chain.stages.stageprotocol import StageProtocol
+from rainbowadn.core import *
-from rainbowadn.core.asserts import assert_true
+from rainbowadn.nullability import *
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from .stageprotocol import StageProtocol
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.nullability.null import Null
-from rainbowadn.core.nullability.nullablereference import NullableReference, NullableReferenceFactory
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = (
     'StageStage',

rainbowadn/chain/stages/stagestateprotocol.py

@@ -1,10 +1,9 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.chain.stages.stage import StateStage
+from rainbowadn.chain.states import *
-from rainbowadn.chain.states.stateprotocol import StateProtocol
+from rainbowadn.core import *
-from rainbowadn.core.asserts import assert_true
+from rainbowadn.nullability import *
-from rainbowadn.core.hashpoint import HashPoint
+from .stagestate import StateStage
-from rainbowadn.core.nullability.nullablereference import NullableReference
 
 __all__ = ('StageStateProtocol',)
 

rainbowadn/chain/states/__init__.py

@@ -0,0 +1,3 @@
+from .activestateprotocol import ActiveStateProtocol
+from .metareductionstateprotocol import MetaReductionStateProtocol
+from .stateprotocol import StateProtocol

rainbowadn/chain/states/activestateprotocol.py

@@ -1,9 +1,8 @@
 from typing import TypeVar
 
-from rainbowadn.chain.states.stateprotocol import StateProtocol
+from rainbowadn.core import *
-from rainbowadn.core.asserts import assert_eq
+from rainbowadn.nullability import *
-from rainbowadn.core.hashpoint import HashPoint
+from .stateprotocol import StateProtocol
-from rainbowadn.core.nullability.nullablereference import NullableReference
 
 __all__ = ('ActiveStateProtocol',)
 

rainbowadn/chain/states/metareductionstateprotocol.py

@@ -1,9 +1,8 @@
 from typing import TypeVar
 
-from rainbowadn.chain.states.activestateprotocol import ActiveStateProtocol
+from rainbowadn.core import *
-from rainbowadn.core.asserts import assert_eq
+from rainbowadn.nullability import *
-from rainbowadn.core.hashpoint import HashPoint
+from .activestateprotocol import ActiveStateProtocol
-from rainbowadn.core.nullability.nullablereference import NullableReference
 
 __all__ = ('MetaReductionStateProtocol',)
 

rainbowadn/chain/states/stateprotocol.py

@@ -1,7 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
-from rainbowadn.core.nullability.nullablereference import NullableReference
+from rainbowadn.nullability import *
 
 __all__ = ('StateProtocol',)
 

rainbowadn/collection/collectioninterface.py

@@ -1,6 +1,6 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.nullability.nullablereference import NullableReference
+from rainbowadn.nullability import *
 
 __all__ = ('CollectionInterface',)
 

rainbowadn/collection/comparison/__init__.py

@@ -0,0 +1,4 @@
+from .comparator import *
+from .hashcomparator import HashComparator
+from .keyedcomparator import KeyedComparator
+from .plaincomparator import PlainComparator

rainbowadn/collection/comparison/comparator.py

@@ -1,7 +1,7 @@
 import abc
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
 
 __all__ = (
     'Comparison',

rainbowadn/collection/comparison/hashcomparator.py

@@ -1,8 +1,8 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.comparison.comparator import Comparison, Left, Right
+from .comparator import *
-from rainbowadn.data.collection.trees.comparison.protocolcomparator import ProtocolComparator
+from .protocolcomparator import ProtocolComparator
 
 __all__ = ('HashComparator',)
 

rainbowadn/collection/comparison/keyedcomparator.py

@@ -1,8 +1,8 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.collection.keyed import Keyed
-from rainbowadn.data.collection.keyed import Keyed
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.comparison.comparator import Comparator, Comparison
+from .comparator import *
 
 __all__ = ('KeyedComparator',)
 

rainbowadn/collection/comparison/plaincomparator.py

@@ -1,7 +1,7 @@
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.atomic.plain import Plain
-from rainbowadn.data.atomic.plain import Plain
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.comparison.comparator import Comparison, Left, Right
+from .comparator import *
-from rainbowadn.data.collection.trees.comparison.protocolcomparator import ProtocolComparator
+from .protocolcomparator import ProtocolComparator
 
 __all__ = ('PlainComparator',)
 

rainbowadn/collection/comparison/protocolcomparator.py

@@ -1,7 +1,7 @@
 import abc
 from typing import Generic, TypeVar
 
-from rainbowadn.data.collection.trees.comparison.comparator import Comparator, Equal
+from .comparator import *
 
 __all__ = ('ProtocolComparator',)
 

rainbowadn/collection/keyed.py

@@ -1,8 +1,7 @@
 import abc
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
-from rainbowadn.core.recursivementionable import RecursiveMentionable
 
 __all__ = ('Keyed',)
 

rainbowadn/collection/keymetadata.py

@@ -1,11 +1,7 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from .keyed import Keyed
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.resolverorigin import ResolverOrigin
-from rainbowadn.data.collection.keyed import Keyed
 
 __all__ = ('KeyMetadata', 'KeyMetadataFactory',)
 

rainbowadn/collection/keyvalue.py

@@ -1,10 +1,7 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
-from rainbowadn.core.hashresolver import HashResolver
+from .keyed import Keyed
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.resolverorigin import ResolverOrigin
-from rainbowadn.data.collection.keyed import Keyed
 
 __all__ = ('KeyValue', 'KeyValueFactory',)
 

rainbowadn/collection/linear/__init__.py

@@ -0,0 +1,2 @@
+from .array import *
+from .stack import *

rainbowadn/collection/linear/array.py

@@ -1,11 +1,6 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = ('Array', 'ArrayFactory',)
 

rainbowadn/collection/linear/stack.py

@@ -1,13 +1,7 @@
 from typing import AsyncIterable, Generic, Iterable, TypeVar
 
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.nullability import *
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.nullability.null import Null
-from rainbowadn.core.nullability.nullablereference import NullableReference, NullableReferenceFactory
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = ('Stack', 'StackFactory',)
 

rainbowadn/collection/pair.py

@@ -1,11 +1,6 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = ('Pair', 'PairFactory',)
 

rainbowadn/collection/trees/binary/__init__.py

@@ -0,0 +1,3 @@
+from .activebinarytree import ActiveBinaryTree
+from .avl import AVL
+from .binarytree import *

rainbowadn/collection/trees/binary/actions/__init__.py

@@ -0,0 +1,3 @@
+from .binaryaction import BinaryAction
+from .stdactions import *
+from .symmetric import *

rainbowadn/collection/trees/binary/actions/binaryaction.py

@@ -1,11 +1,9 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
+from rainbowadn.collection.trees.binary.core import *
 
 __all__ = ('BinaryAction',)
 
-from rainbowadn.data.collection.trees.binary.protocolizedbinarysplit import ProtocolizedBinarySplit
-
 TreeType = TypeVar('TreeType')
 ActiveKeyType = TypeVar('ActiveKeyType')
 MetaDataType = TypeVar('MetaDataType')

rainbowadn/collection/trees/binary/actions/compareaction.py

@@ -1,10 +1,10 @@
 import abc
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.collection.comparison import *
-from rainbowadn.data.collection.trees.binary.actions.binaryaction import BinaryAction
+from rainbowadn.collection.trees.binary.core import *
-from rainbowadn.data.collection.trees.binary.protocolizedbinarysplit import ProtocolizedBinarySplit
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.comparison.comparator import Comparison, Equal, Left, Right
+from .binaryaction import BinaryAction
 
 __all__ = ('CompareAction',)
 

rainbowadn/collection/trees/binary/actions/stdactions.py

@@ -1,10 +1,9 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.data.collection.trees.binary.actions.binaryaction import BinaryAction
+from rainbowadn.collection.comparison import *
-from rainbowadn.data.collection.trees.binary.actions.compareaction import CompareAction
+from rainbowadn.collection.trees.binary.core import *
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
+from .binaryaction import BinaryAction
-from rainbowadn.data.collection.trees.binary.protocolizedbinarysplit import ProtocolizedBinarySplit
+from .compareaction import CompareAction
-from rainbowadn.data.collection.trees.comparison.comparator import Equal, Replace
 
 __all__ = ('AddAction', 'RemoveAction', 'ContainsAction',)
 
@@ -57,7 +56,7 @@ class AddAction(
             protocolized: BinaryProtocolized[ActiveKeyType, MetaDataType, TreeType],
     ) -> TreeType:
         assert isinstance(protocolized, BinaryProtocolized)
-        return await protocolized.protocol.tree(protocolized.tree, protocolized.tree, self.key)
+        return await protocolized.creation.tree(protocolized.tree, protocolized.tree, self.key)
 
 
 class MergeAction(

rainbowadn/collection/trees/binary/actions/symmetric.py

@@ -1,9 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.collection.trees.binary.core import *
-from rainbowadn.data.collection.trees.binary.binarycreation import BinaryCreation
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
-from rainbowadn.data.collection.trees.binary.binarysplit import BinarySplit
 
 __all__ = ('Symmetric', 'InnerOuter', 'OuterInner',)
 

rainbowadn/collection/trees/binary/activebinarytree.py

@@ -1,18 +1,12 @@
 from typing import Generic, Optional, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.collection.collectioninterface import CollectionInterface
-from rainbowadn.core.nullability.null import Null
+from rainbowadn.collection.keymetadata import *
-from rainbowadn.core.nullability.nullablereference import NullableReference
+from rainbowadn.core import *
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from rainbowadn.nullability import *
-from rainbowadn.data.collection.collection_interface.collectioninterface import CollectionInterface
+from .actions import *
-from rainbowadn.data.collection.keymetadata import KeyMetadata, KeyMetadataFactory
+from .binarytree import *
-from rainbowadn.data.collection.trees.binary.actions.stdactions import AddAction, ContainsAction, RemoveAction
+from .core import *
-from rainbowadn.data.collection.trees.binary.balancedcreation import BalancedCreation
-from rainbowadn.data.collection.trees.binary.binarybalancing import BinaryBalancing
-from rainbowadn.data.collection.trees.binary.binarycreation import BinaryCreation
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
-from rainbowadn.data.collection.trees.binary.binarysplit import BinarySplit
-from rainbowadn.data.collection.trees.binary.binarytree import BinaryTree, BinaryTreeFactory
 
 __all__ = ('ActiveBinaryTree',)
 

rainbowadn/collection/trees/binary/avl.py

@@ -1,14 +1,9 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.atomic import *
-from rainbowadn.data.atomic.integer import Integer
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.binary.actions.binaryaction import BinaryAction
+from .actions import *
-from rainbowadn.data.collection.trees.binary.actions.symmetric import InnerOuter, OuterInner, Symmetric
+from .core import *
-from rainbowadn.data.collection.trees.binary.binarybalancing import BinaryBalancing
-from rainbowadn.data.collection.trees.binary.binarycreation import BinaryCreation
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
-from rainbowadn.data.collection.trees.binary.binarysplit import BinarySplit
-from rainbowadn.data.collection.trees.binary.protocolizedbinarysplit import ProtocolizedBinarySplit
 
 __all__ = ('AVL',)
 
@@ -25,16 +20,16 @@ class AVL(BinaryBalancing[ActiveKeyType, Integer, TreeType]):
             treel: TreeType,
             treer: TreeType,
             key: HashPoint[ActiveKeyType],
-            protocol: BinaryCreation[ActiveKeyType, Integer, TreeType]
+            creation: BinaryCreation[ActiveKeyType, Integer, TreeType]
     ) -> HashPoint[Integer]:
-        assert isinstance(protocol, BinaryCreation)
+        assert isinstance(creation, BinaryCreation)
         return HashPoint.of(
             Integer(
                 1
                 +
                 max(
-                    await self.height(BinaryProtocolized(protocol, treel)),
+                    await self.height(BinaryProtocolized(creation, treel)),
-                    await self.height(BinaryProtocolized(protocol, treer))
+                    await self.height(BinaryProtocolized(creation, treer))
                 )
             )
         )
@@ -97,26 +92,26 @@ class BalanceAction(
     @classmethod
     async def on_symmetric(
             cls,
-            symmetric: Symmetric[ActiveKeyType, Integer, TreeType],
+            symmetry: Symmetric[ActiveKeyType, Integer, TreeType],
             split: BinarySplit[ActiveKeyType, Integer, TreeType]
     ) -> TreeType:
-        assert isinstance(symmetric, Symmetric)
+        assert isinstance(symmetry, Symmetric)
         assert isinstance(split, BinarySplit)
-        splito = await symmetric.protocol.fsplit(symmetric.outer(split))
+        splito = await symmetry.protocol.fsplit(symmetry.outer(split))
         if (
-                (await AVL.height(symmetric.protocolizedi(splito)))
+                (await AVL.height(symmetry.protocolizedi(splito)))
                 >
-                (await AVL.height(symmetric.protocolizedo(splito)))
+                (await AVL.height(symmetry.protocolizedo(splito)))
         ):
-            splitoi = await symmetric.protocol.fsplit(symmetric.inner(splito))
+            splitoi = await symmetry.protocol.fsplit(symmetry.inner(splito))
-            return await symmetric.tree(
+            return await symmetry.tree(
-                await symmetric.tree(symmetric.inner(split), symmetric.inner(splitoi), split.key),
+                await symmetry.tree(symmetry.inner(split), symmetry.inner(splitoi), split.key),
-                await symmetric.tree(symmetric.outer(splitoi), symmetric.outer(splito), splito.key),
+                await symmetry.tree(symmetry.outer(splitoi), symmetry.outer(splito), splito.key),
                 splitoi.key
             )
         else:
-            return await symmetric.tree(
+            return await symmetry.tree(
-                await symmetric.tree(symmetric.inner(split), symmetric.inner(splito), split.key),
+                await symmetry.tree(symmetry.inner(split), symmetry.inner(splito), split.key),
-                symmetric.outer(splito),
+                symmetry.outer(splito),
                 splito.key
             )

rainbowadn/collection/trees/binary/binarytree.py

@@ -1,12 +1,7 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.core.hash_point_format import hash_point_format, tabulate
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.nullability import *
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.nullability.nullablereference import NullableReference, NullableReferenceFactory
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = ('BinaryTree', 'BinaryTreeFactory',)
 

rainbowadn/collection/trees/binary/core/__init__.py

@@ -0,0 +1,6 @@
+from .balancedcreation import BalancedCreation
+from .binarybalancing import BinaryBalancing
+from .binarycreation import BinaryCreation
+from .binaryprotocolized import BinaryProtocolized
+from .binarysplit import BinarySplit
+from .protocolizedbinarysplit import ProtocolizedBinarySplit

rainbowadn/collection/trees/binary/core/balancedcreation.py

@@ -1,14 +1,13 @@
 import abc
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.binary.binarybalancing import BinaryBalancing
+from .binarybalancing import BinaryBalancing
-from rainbowadn.data.collection.trees.binary.binarycreation import BinaryCreation
+from .binarycreation import BinaryCreation
+from .binaryprotocolized import BinaryProtocolized
 
 __all__ = ('BalancedCreation',)
 
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
-
 TreeType = TypeVar('TreeType')
 ActiveKeyType = TypeVar('ActiveKeyType')
 MetaDataType = TypeVar('MetaDataType')

rainbowadn/collection/trees/binary/core/binarybalancing.py

@@ -1,9 +1,9 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.collection.comparison import *
-from rainbowadn.data.collection.trees.binary.binarycreation import BinaryCreation
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
+from .binarycreation import BinaryCreation
-from rainbowadn.data.collection.trees.comparison.comparator import Comparator
+from .binaryprotocolized import BinaryProtocolized
 
 __all__ = ('BinaryBalancing',)
 
@@ -13,12 +13,9 @@ MetaDataType = TypeVar('MetaDataType')
 
 
 class BinaryBalancing(Generic[ActiveKeyType, MetaDataType, TreeType]):
-    def __init__(
+    def __init__(self, comparator_: Comparator[ActiveKeyType]):
-            self,
+        assert isinstance(comparator_, Comparator)
-            comparator: Comparator[ActiveKeyType]
+        self.comparator = comparator_
-    ):
-        assert isinstance(comparator, Comparator)
-        self.comparator = comparator
 
     def empty_metadata(self) -> HashPoint[MetaDataType]:
         raise NotImplementedError
@@ -28,7 +25,7 @@ class BinaryBalancing(Generic[ActiveKeyType, MetaDataType, TreeType]):
             treel: TreeType,
             treer: TreeType,
             key: HashPoint[ActiveKeyType],
-            protocol: BinaryCreation[ActiveKeyType, MetaDataType, TreeType]
+            creation: BinaryCreation[ActiveKeyType, MetaDataType, TreeType]
     ) -> HashPoint[MetaDataType]:
         raise NotImplementedError
 

rainbowadn/collection/trees/binary/core/binarycreation.py

@@ -1,8 +1,8 @@
 from typing import Generic, Optional, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.collection.comparison import *
-from rainbowadn.data.collection.trees.binary.binarysplit import BinarySplit
+from rainbowadn.core import *
-from rainbowadn.data.collection.trees.comparison.comparator import Comparator
+from .binarysplit import BinarySplit
 
 __all__ = ('BinaryCreation',)
 
@@ -12,8 +12,9 @@ MetaDataType = TypeVar('MetaDataType')
 
 
 class BinaryCreation(Generic[ActiveKeyType, MetaDataType, TreeType]):
-    def __init__(self, comparator: Comparator[ActiveKeyType]):
+    def __init__(self, comparator_: Comparator[ActiveKeyType]):
-        self.comparator = comparator
+        assert isinstance(comparator_, Comparator)
+        self.comparator = comparator_
 
     async def split(self, tree: TreeType) -> Optional[
         BinarySplit[ActiveKeyType, MetaDataType, TreeType]

rainbowadn/collection/trees/binary/core/binaryprotocolized.py

@@ -1,7 +1,7 @@
 from typing import Generic, Optional, TypeVar
 
-from rainbowadn.data.collection.trees.binary.binarycreation import BinaryCreation
+from .binarycreation import BinaryCreation
-from rainbowadn.data.collection.trees.binary.binarysplit import BinarySplit
+from .binarysplit import BinarySplit
 
 __all__ = ('BinaryProtocolized',)
 
@@ -15,12 +15,12 @@ class BinaryProtocolized(
 ):
     def __init__(
             self,
-            protocol: BinaryCreation[ActiveKeyType, MetaDataType, TreeType],
+            creation: BinaryCreation[ActiveKeyType, MetaDataType, TreeType],
             tree: TreeType
     ):
-        assert isinstance(protocol, BinaryCreation)
+        assert isinstance(creation, BinaryCreation)
-        self.protocol = protocol
+        self.creation = creation
         self.tree = tree
 
     async def split(self) -> Optional[BinarySplit[ActiveKeyType, MetaDataType, TreeType]]:
-        return await self.protocol.split(self.tree)
+        return await self.creation.split(self.tree)

rainbowadn/collection/trees/binary/core/binarysplit.py

@@ -1,6 +1,6 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from rainbowadn.core import *
 
 __all__ = ('BinarySplit',)
 

rainbowadn/collection/trees/binary/core/protocolizedbinarysplit.py

@@ -1,8 +1,8 @@
 from typing import Generic, Optional, TypeVar
 
-from rainbowadn.data.collection.trees.binary.binarycreation import BinaryCreation
+from .binarycreation import BinaryCreation
-from rainbowadn.data.collection.trees.binary.binaryprotocolized import BinaryProtocolized
+from .binaryprotocolized import BinaryProtocolized
-from rainbowadn.data.collection.trees.binary.binarysplit import BinarySplit
+from .binarysplit import BinarySplit
 
 __all__ = ('ProtocolizedBinarySplit',)
 
@@ -45,4 +45,4 @@ class ProtocolizedBinarySplit(
         if (split := await protocolized.split()) is None:
             return None
         else:
-            return ProtocolizedBinarySplit(protocolized.protocol, split, protocolized.tree)
+            return ProtocolizedBinarySplit(protocolized.creation, split, protocolized.tree)

rainbowadn/core/__init__.py

@@ -0,0 +1,15 @@
+from .asserts import *
+from .extendableresolver import ExtendableResolver
+from .hash_point_format import *
+from .hashpoint import HashPoint
+from .hashresolver import HashResolver
+from .localmetaorigin import LocalMetaOrigin
+from .localorigin import LocalOrigin
+from .mentionable import Mentionable
+from .metaorigin import MetaOrigin
+from .origin import Origin
+from .rainbow_factory import RainbowFactory
+from .recursivementionable import RecursiveMentionable
+from .resolvermetaorigin import ResolverMetaOrigin
+from .resolverorigin import ResolverOrigin
+from .static import *

rainbowadn/core/asserts.py

@@ -1,5 +1,7 @@
 from typing import Optional, TypeVar
 
+__all__ = ('assert_true', 'assert_false', 'assert_none', 'assert_eq',)
+
 
 def assert_true(value: bool) -> bool:
     assert value is True

rainbowadn/core/extendableresolver.py

@@ -1,9 +1,11 @@
 import abc
 from typing import TypeVar
 
-from rainbowadn.core.hashpoint import HashPoint
+from .hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
+from .hashresolver import HashResolver
-from rainbowadn.core.resolvermetaorigin import ResolverMetaOrigin
+from .resolvermetaorigin import ResolverMetaOrigin
+
+__all__ = ('ExtendableResolver',)
 
 Mentioned = TypeVar('Mentioned')
 

rainbowadn/core/hash_point_format.py

@@ -1,6 +1,6 @@
-from rainbowadn.core.hashpoint import HashPoint
+from .hashpoint import HashPoint
-from rainbowadn.core.mentionable import Mentionable
+from .mentionable import Mentionable
-from rainbowadn.core.recursivementionable import RecursiveMentionable
+from .recursivementionable import RecursiveMentionable
 
 __all__ = ('hash_point_format', 'tabulate',)
 

rainbowadn/core/hashpoint.py

@@ -1,11 +1,11 @@
 import hashlib
 from typing import Generic, TypeVar
 
-from rainbowadn.core.asserts import assert_eq
+from .asserts import *
-from rainbowadn.core.localorigin import LocalOrigin
+from .localorigin import LocalOrigin
-from rainbowadn.core.mentionable import Mentionable
+from .mentionable import Mentionable
-from rainbowadn.core.origin import Origin
+from .origin import Origin
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
 
 __all__ = ('HashPoint',)
 

rainbowadn/core/localmetaorigin.py

@@ -1,10 +1,10 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.asserts import assert_eq
+from .asserts import *
-from rainbowadn.core.hashpoint import HashPoint
+from .hashpoint import HashPoint
-from rainbowadn.core.metaorigin import MetaOrigin
+from .metaorigin import MetaOrigin
-from rainbowadn.core.origin import Origin
+from .origin import Origin
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
 
 __all__ = ('LocalMetaOrigin',)
 

rainbowadn/core/localorigin.py

@@ -1,7 +1,7 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.mentionable import Mentionable
+from .mentionable import Mentionable
-from rainbowadn.core.origin import Origin
+from .origin import Origin
 
 __all__ = ('LocalOrigin',)
 

rainbowadn/core/mentionable.py

@@ -1,6 +1,6 @@
 from typing import TypeVar
 
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
 
 __all__ = ('Mentionable',)
 

rainbowadn/core/metaorigin.py

@@ -1,9 +1,9 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.asserts import assert_eq
+from .asserts import *
-from rainbowadn.core.hashpoint import HashPoint
+from .hashpoint import HashPoint
-from rainbowadn.core.origin import Origin
+from .origin import Origin
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
 
 __all__ = ('MetaOrigin',)
 

rainbowadn/core/origin.py

@@ -1,6 +1,6 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
 
 __all__ = ('Origin',)
 

rainbowadn/core/rainbow_factory.py

@@ -1,6 +1,6 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.hashresolver import HashResolver
+from .hashresolver import HashResolver
 
 __all__ = ('RainbowFactory',)
 

rainbowadn/core/recursivementionable.py

@@ -1,8 +1,8 @@
 import abc
 from typing import Iterable
 
-from rainbowadn.core.hashpoint import HashPoint
+from .hashpoint import HashPoint
-from rainbowadn.core.mentionable import Mentionable
+from .mentionable import Mentionable
 
 __all__ = ('RecursiveMentionable',)
 

rainbowadn/core/resolvermetaorigin.py

@@ -1,12 +1,12 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.asserts import assert_eq
+from .asserts import *
-from rainbowadn.core.hashpoint import HashPoint
+from .hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
+from .hashresolver import HashResolver
-from rainbowadn.core.metaorigin import MetaOrigin
+from .metaorigin import MetaOrigin
-from rainbowadn.core.origin import Origin
+from .origin import Origin
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
-from rainbowadn.core.resolverorigin import ResolverOrigin
+from .resolverorigin import ResolverOrigin
 
 __all__ = ('ResolverMetaOrigin',)
 

rainbowadn/core/resolverorigin.py

@@ -1,11 +1,11 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.asserts import assert_eq
+from .asserts import *
-from rainbowadn.core.hashpoint import HashPoint
+from .hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
+from .hashresolver import HashResolver
-from rainbowadn.core.mentionable import Mentionable
+from .mentionable import Mentionable
-from rainbowadn.core.origin import Origin
+from .origin import Origin
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
 
 __all__ = ('ResolverOrigin',)
 

rainbowadn/core/static.py

@@ -1,9 +1,9 @@
 import abc
 from typing import Generic, Type, TypeVar
 
-from rainbowadn.core.hashresolver import HashResolver
+from .hashresolver import HashResolver
-from rainbowadn.core.mentionable import Mentionable
+from .mentionable import Mentionable
-from rainbowadn.core.rainbow_factory import RainbowFactory
+from .rainbow_factory import RainbowFactory
 
 __all__ = ('StaticMentionable', 'StaticFactory',)
 

rainbowadn/encryption/__init__.py

@@ -0,0 +1 @@
+from .encrypted import *

rainbowadn/encryption/encrypted.py

@@ -3,14 +3,7 @@ from typing import Generic, Iterable, TypeVar
 from nacl.bindings import crypto_hash_sha256
 from nacl.secret import SecretBox
 
-from rainbowadn.core.asserts import assert_eq
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
-from rainbowadn.core.hashresolver import HashResolver
-from rainbowadn.core.mentionable import Mentionable
-from rainbowadn.core.origin import Origin
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = ('Encrypted', 'EncryptedFactory')
 
@@ -49,9 +42,9 @@ class Encrypted(RecursiveMentionable, Generic[EncryptedType]):
         hashpoints = tuple(decrypted.points()) if isinstance(decrypted, RecursiveMentionable) else ()
         resolution: tuple[HashPoint[Encrypted[EncryptedType]], ...] = tuple(
             [
-                await cls.encrypt_hashpoint(hashpoint, key)
+                await cls.encrypt_hashpoint(hash_point, key)
                 for
-                hashpoint
+                hash_point
                 in
                 hashpoints
             ]
@@ -65,20 +58,20 @@ class Encrypted(RecursiveMentionable, Generic[EncryptedType]):
 
     @classmethod
     async def encrypt_hashpoint(
-            cls, hashpoint: HashPoint[EncryptedType], key: bytes
+            cls, hash_point: HashPoint[EncryptedType], key: bytes
     ) -> HashPoint['Encrypted[EncryptedType]']:
-        assert isinstance(hashpoint, HashPoint)
+        assert isinstance(hash_point, HashPoint)
         assert isinstance(key, bytes)
-        if isinstance(hashpoint.origin, ResolverOrigin):
+        if isinstance(hash_point.origin, ResolverOrigin):
-            resolver: HashResolver = hashpoint.origin.resolver
+            resolver: HashResolver = hash_point.origin.resolver
             assert isinstance(resolver, HashResolver)
             if isinstance(resolver, EncryptedResolver) and resolver.key == key:
                 return ShortcutOrigin(
-                    hashpoint.factory,
+                    hash_point.factory,
-                    resolver.mapping[hashpoint.point],
+                    resolver.mapping[hash_point.point],
                     key
                 ).hash_point()
-        return HashPoint.of(await cls.encrypt(await hashpoint.resolve(), key))
+        return HashPoint.of(await cls.encrypt(await hash_point.resolve(), key))
 
     @classmethod
     def construct(
@@ -89,7 +82,7 @@ class Encrypted(RecursiveMentionable, Generic[EncryptedType]):
             decrypted: EncryptedType
     ) -> 'Encrypted[EncryptedType]':
         mapping: dict[bytes, HashPoint[Encrypted]] = {
-            hashpoint.point: encrypted for hashpoint, encrypted in zip(hashpoints, resolution)
+            hash_point.point: encrypted for hash_point, encrypted in zip(hashpoints, resolution)
         }
         return Encrypted(
             key,
@@ -136,12 +129,12 @@ class EncryptedFactory(RainbowFactory[Encrypted[EncryptedType]], Generic[Encrypt
         resolution: tuple[HashPoint[Encrypted], ...] = tuple(
             ResolverOrigin(
                 EncryptedFactory(
-                    hashpoint.factory,
+                    hash_point.factory,
                     self.key
                 ),
                 plain[8 + i * HashPoint.HASH_LENGTH: 8 + (i + 1) * HashPoint.HASH_LENGTH],
                 resolver
-            ).hash_point() for i, hashpoint in enumerate(hashpoints)
+            ).hash_point() for i, hash_point in enumerate(hashpoints)
         )
         return Encrypted.construct(
             self.key,
@@ -165,13 +158,13 @@ class EncryptedResolver(HashResolver):
 
 
 class ShortcutOrigin(Origin[Encrypted[EncryptedType]], Generic[EncryptedType]):
-    def __init__(self, factory: RainbowFactory[EncryptedType], hashpoint: HashPoint[Encrypted], key: bytes):
+    def __init__(self, factory: RainbowFactory[EncryptedType], hash_point: HashPoint[Encrypted], key: bytes):
         assert isinstance(factory, RainbowFactory)
-        assert isinstance(hashpoint, HashPoint)
+        assert isinstance(hash_point, HashPoint)
         assert isinstance(key, bytes)
         self.factory: RainbowFactory[Encrypted[EncryptedType]] = EncryptedFactory(factory, key)
         assert isinstance(self.factory, RainbowFactory)
-        self.hashpoint = hashpoint
+        self.hashpoint = hash_point
         super().__init__(self.factory)
 
     async def resolve(self) -> Encrypted[EncryptedType]:
@@ -191,7 +184,7 @@ class ShortcutResolver(HashResolver):
     def __init__(self, encrypted: Encrypted):
         assert isinstance(encrypted, Encrypted)
         self.mapping: dict[bytes, HashPoint[Encrypted]] = {
-            hashpoint.point: hashpoint for hashpoint in encrypted.resolution
+            hash_point.point: hash_point for hash_point in encrypted.resolution
         }
 
     async def resolve(self, point: bytes) -> tuple[bytes, 'HashResolver']:

rainbowadn/nullability/__init__.py

@@ -0,0 +1,4 @@
+from .notnull import NotNull
+from .null import Null
+from .nullable import Nullable
+from .nullablereference import *

rainbowadn/nullability/notnull.py

@@ -1,6 +1,6 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.nullability.nullable import Nullable
+from .nullable import Nullable
 
 __all__ = ('NotNull',)
 

rainbowadn/nullability/null.py

@@ -1,6 +1,6 @@
 from typing import Generic, TypeVar
 
-from rainbowadn.core.nullability.nullable import Nullable
+from .nullable import Nullable
 
 __all__ = ('Null',)
 

rainbowadn/nullability/nullablereference.py

@@ -1,14 +1,9 @@
 from typing import Generic, Iterable, TypeVar
 
-from rainbowadn.core.hash_point_format import hash_point_format
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+from .notnull import NotNull
-from rainbowadn.core.hashresolver import HashResolver
+from .null import Null
-from rainbowadn.core.nullability.notnull import NotNull
+from .nullable import Nullable
-from rainbowadn.core.nullability.null import Null
-from rainbowadn.core.nullability.nullable import Nullable
-from rainbowadn.core.rainbow_factory import RainbowFactory
-from rainbowadn.core.recursivementionable import RecursiveMentionable
-from rainbowadn.core.resolverorigin import ResolverOrigin
 
 __all__ = ('NullableReference', 'NullableReferenceFactory',)
 

rainbowadn/testing/dictresolver.py

@@ -1,11 +1,11 @@
 from collections import OrderedDict
-from typing import MutableMapping
+from typing import MutableMapping, TypeVar
 
-from rainbowadn.core.extendableresolver import ExtendableResolver, Mentioned
+from rainbowadn.core import *
-from rainbowadn.core.hashpoint import HashPoint
+
-from rainbowadn.core.hashresolver import HashResolver
+__all__ = ('DictResolver',)
-from rainbowadn.core.mentionable import Mentionable
+
-from rainbowadn.core.recursivementionable import RecursiveMentionable
+Mentioned = TypeVar('Mentioned')
 
 
 class DictResolver(ExtendableResolver):