Removing transaction symbols from package namespace (2)

docs/types.rst

@@ -101,7 +101,9 @@ Transaction
 
 .. code:: python
 
-    from iota import Address, ProposedTransaction, Tag, Transaction
+    from iota import Address, Tag
+    from iota.transaction.base import Transaction
+    from iota.transaction.creation import ProposedTransaction
 
     txn_1 =\
       Transaction.from_tryte_string(
@@ -263,7 +265,7 @@ Bundle
 
 .. code:: python
 
-    from iota import Bundle
+    from iota.transaction.base import Bundle
 
     bundle = Bundle.from_tryte_strings([
       b'GYPRVHBEZOOFXSHQBLCYW9ICTCISLHDBNMMVYD9JJHQMPQCTIQAQTJNNNJ9IDXLRCC...',
@@ -293,7 +295,8 @@ ProposedBundle
 
 .. code:: python
 
-    from iota import Address, ProposedBundle, ProposedTransaction
+    from iota import Address
+    from iota.transaction.creation import ProposedBundle, ProposedTransaction
     from iota.crypto.signing import KeyGenerator
 
     bundle = ProposedBundle()

examples/mam_js_send.py

@@ -12,11 +12,13 @@
 import filters as f
 from six import binary_type, text_type
 
-from iota import Bundle, Iota, TransactionTrytes
+from iota import Iota
 from iota.bin import IotaCommandLineApp
 from iota.crypto.addresses import AddressGenerator
 from iota.filters import Trytes
 from iota.json import JsonEncoder
+from iota.transaction.base import Bundle
+from iota.transaction.types import TransactionTrytes
 
 
 class IotaMamExample(IotaCommandLineApp):

examples/multisig.py

@@ -15,11 +15,14 @@
 
 from typing import List
 
-from iota import Address, Bundle, BundleValidator, ProposedTransaction, Tag, \
-    TransactionTrytes, TryteString
+from iota import Address, Tag, TryteString
 from iota.crypto.types import Digest, PrivateKey, Seed
 from iota.multisig import MultisigIota
 from iota.multisig.types import MultisigAddress
+from iota.transaction.base import Bundle
+from iota.transaction.creation import ProposedTransaction
+from iota.transaction.types import TransactionTrytes
+from iota.transaction.validator import BundleValidator
 
 """
 Step 1:  Each participant generates one or more digests that will be

examples/routingwrapper_pow.py

@@ -7,8 +7,9 @@
 
 - https://pyota.readthedocs.io/en/develop/adapters.html#routingwrapper
 """
-from iota import Address, Iota, ProposedTransaction, Tag, TryteString
+from iota import Address, Iota, Tag, TryteString
 from iota.adapter.wrappers import RoutingWrapper
+from iota.transaction.creation import ProposedTransaction
 
 # Send PoW requests to local node.
 # All other requests go to light wallet node.

examples/sandbox.py

@@ -2,8 +2,9 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-from iota import Address, Iota, ProposedTransaction, Tag, TryteString
+from iota import Address, Iota, Tag, TryteString
 from iota.adapter.sandbox import SandboxAdapter
+from iota.transaction.creation import ProposedTransaction
 
 # Create the API client.
 api = Iota(

examples/send_transfer.py

@@ -2,19 +2,20 @@
 """
 Example script that shows how to use PyOTA to send a transfer to an address.
 """
+
 from argparse import ArgumentParser
+from six import text_type
 from sys import argv
 
+from address_generator import get_seed, output_seed
 from iota import (
   __version__,
   Address,
   Iota,
-  ProposedTransaction,
   Tag,
   TryteString,
 )
-from six import text_type
-from address_generator import get_seed, output_seed
+from iota.transaction.creation import ProposedTransaction
 
 
 def main(address, depth, message, tag, uri, value):

iota/__init__.py

@@ -33,7 +33,6 @@
 # Make some imports accessible from the top level of the package.
 # Note that order is important, to prevent circular imports.
 from .types import *
-from .transaction import *
 from .adapter import *
 from .api import *
 from .trits import *

iota/api.py

@@ -2,18 +2,19 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-from typing import Dict, Iterable, Optional, Text
-
 from six import with_metaclass
+from typing import Dict, Iterable, Optional, Text
 
-from iota import AdapterSpec, Address, BundleHash, ProposedTransaction, Tag, \
-    TransactionHash, TransactionTrytes, TryteString, TrytesCompatible
+from iota import AdapterSpec, Address, Tag, TryteString, TrytesCompatible
 from iota.adapter import BaseAdapter, resolve_adapter
 from iota.commands import BaseCommand, CustomCommand, core, \
     discover_commands, extended
 from iota.commands.extended.helpers import Helpers
 from iota.crypto.addresses import AddressGenerator
 from iota.crypto.types import Seed
+from iota.transaction.creation import ProposedTransaction
+from iota.transaction.types import BundleHash, TransactionHash, \
+    TransactionTrytes
 
 __all__ = [
     'InvalidCommand',

iota/commands/core/attach_to_tangle.py

@@ -4,8 +4,8 @@
 
 import filters as f
 
-from iota import TransactionHash, TransactionTrytes
 from iota.commands import FilterCommand, RequestFilter, ResponseFilter
+from iota.transaction.types import TransactionHash, TransactionTrytes
 from iota.filters import Trytes
 
 __all__ = [

iota/commands/core/broadcast_transactions.py

@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import TransactionTrytes
 from iota.commands import FilterCommand, RequestFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionTrytes
 
 __all__ = [
     'BroadcastTransactionsCommand',

iota/commands/core/check_consistency.py

@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import TransactionHash
 from iota.commands import FilterCommand, RequestFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'CheckConsistencyCommand',

iota/commands/core/find_transactions.py

@@ -5,9 +5,10 @@
 import filters as f
 from six import iteritems
 
-from iota import BundleHash, Tag, TransactionHash
+from iota import Tag
 from iota.commands import FilterCommand, RequestFilter, ResponseFilter
 from iota.filters import AddressNoChecksum, Trytes
+from iota.transaction.types import BundleHash, TransactionHash
 
 __all__ = [
     'FindTransactionsCommand',

iota/commands/core/get_inclusion_states.py

@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import TransactionHash
 from iota.commands import FilterCommand, RequestFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'GetInclusionStatesCommand',

iota/commands/core/get_node_info.py

@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import TransactionHash
 from iota.commands import FilterCommand, RequestFilter, ResponseFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'GetNodeInfoCommand',

iota/commands/core/get_transactions_to_approve.py

@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import TransactionHash
 from iota.commands import FilterCommand, RequestFilter, ResponseFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'GetTransactionsToApproveCommand',

iota/commands/core/get_trytes.py

@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import TransactionHash
 from iota.commands import FilterCommand, RequestFilter, ResponseFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'GetTrytesCommand',

iota/commands/core/store_transactions.py

@@ -4,9 +4,9 @@
 
 import filters as f
 
-from iota import TransactionTrytes
 from iota.commands import FilterCommand, RequestFilter
 from iota.filters import Trytes
+from iota.transaction.types import TransactionTrytes
 
 __all__ = [
     'StoreTransactionsCommand',

iota/commands/extended/get_account_data.py

@@ -7,7 +7,7 @@
 
 import filters as f
 
-from iota import Address, TransactionHash
+from iota import Address
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.core.find_transactions import FindTransactionsCommand
 from iota.commands.core.get_balances import GetBalancesCommand
@@ -16,6 +16,7 @@
 from iota.crypto.addresses import AddressGenerator
 from iota.crypto.types import Seed
 from iota.filters import Trytes, SecurityLevel
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'GetAccountDataCommand',

iota/commands/extended/get_bundles.py

@@ -6,12 +6,13 @@
 
 import filters as f
 
-from iota import BadApiResponse, Bundle, BundleHash, Transaction, \
-    TransactionHash, TryteString
+from iota import BadApiResponse, TryteString
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.core.get_trytes import GetTrytesCommand
 from iota.exceptions import with_context
 from iota.filters import Trytes
+from iota.transaction.base import Bundle, Transaction
+from iota.transaction.types import BundleHash, TransactionHash
 from iota.transaction.validator import BundleValidator
 
 __all__ = [

iota/commands/extended/get_latest_inclusion.py

@@ -6,11 +6,11 @@
 
 import filters as f
 
-from iota import TransactionHash
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.core.get_inclusion_states import GetInclusionStatesCommand
 from iota.commands.core.get_node_info import GetNodeInfoCommand
 from iota.filters import Trytes
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'GetLatestInclusionCommand',

iota/commands/extended/prepare_transfer.py

@@ -6,8 +6,7 @@
 
 import filters as f
 
-from iota import Address, BadApiResponse, ProposedBundle, \
-    ProposedTransaction
+from iota import Address, BadApiResponse
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.core.get_balances import GetBalancesCommand
 from iota.commands.extended.get_inputs import GetInputsCommand
@@ -16,6 +15,7 @@
 from iota.crypto.types import Seed
 from iota.exceptions import with_context
 from iota.filters import GeneratedAddress, SecurityLevel, Trytes
+from iota.transaction.creation import ProposedBundle, ProposedTransaction
 
 __all__ = [
     'PrepareTransferCommand',

iota/commands/extended/promote_transaction.py

@@ -4,11 +4,13 @@
 
 import filters as f
 
-from iota import Address, BadApiResponse, ProposedTransaction, TransactionHash
+from iota import Address, BadApiResponse
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.core.check_consistency import CheckConsistencyCommand
 from iota.commands.extended.send_transfer import SendTransferCommand
 from iota.filters import Trytes
+from iota.transaction.creation import ProposedTransaction
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'PromoteTransactionCommand',

iota/commands/extended/replay_bundle.py

@@ -4,11 +4,12 @@
 
 import filters as f
 
-from iota import Bundle, TransactionHash
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.extended.get_bundles import GetBundlesCommand
 from iota.commands.extended.send_trytes import SendTrytesCommand
 from iota.filters import Trytes
+from iota.transaction.base import Bundle
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'ReplayBundleCommand',

iota/commands/extended/send_transfer.py

@@ -6,12 +6,15 @@
 
 import filters as f
 
-from iota import Address, Bundle, ProposedTransaction, TransactionHash
+from iota import Address
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.extended.prepare_transfer import PrepareTransferCommand
 from iota.commands.extended.send_trytes import SendTrytesCommand
 from iota.crypto.types import Seed
 from iota.filters import SecurityLevel, Trytes
+from iota.transaction.base import Bundle
+from iota.transaction.creation import ProposedTransaction
+from iota.transaction.types import TransactionHash
 
 __all__ = [
     'SendTransferCommand',

iota/commands/extended/send_trytes.py

@@ -6,13 +6,14 @@
 
 import filters as f
 
-from iota import TransactionHash, TransactionTrytes, TryteString
+from iota import TryteString
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.core.attach_to_tangle import AttachToTangleCommand
 from iota.commands.core.get_transactions_to_approve import \
     GetTransactionsToApproveCommand
 from iota.commands.extended.broadcast_and_store import BroadcastAndStoreCommand
 from iota.filters import Trytes
+from iota.transaction.types import TransactionTrytes, TransactionHash
 
 __all__ = [
     'SendTrytesCommand',

iota/commands/extended/utils.py

@@ -4,8 +4,7 @@
 
 from typing import Generator, Iterable, List, Optional, Tuple
 
-from iota import Address, Bundle, Transaction, \
-    TransactionHash
+from iota import Address
 from iota.adapter import BaseAdapter
 from iota.commands.core.find_transactions import FindTransactionsCommand
 from iota.commands.core.get_trytes import GetTrytesCommand
@@ -14,6 +13,8 @@
     GetLatestInclusionCommand
 from iota.crypto.addresses import AddressGenerator
 from iota.crypto.types import Seed
+from iota.transaction.base import Bundle, Transaction
+from iota.transaction.types import TransactionHash
 
 
 def find_transaction_objects(adapter, **kwargs):

iota/multisig/api.py

@@ -4,12 +4,13 @@
 
 from typing import Iterable, Optional
 
-from iota import Address, Iota, ProposedTransaction
+from iota import Address, Iota
 from iota.commands import discover_commands
 from iota.crypto.addresses import AddressGenerator
 from iota.crypto.types import Digest
 from iota.multisig import commands
 from iota.multisig.types import MultisigAddress
+from iota.transaction.creation import ProposedTransaction
 
 __all__ = [
     'MultisigIota',