move address.py in messages.utils

CounterpartyXCP · Jan 13, 2025 · d164bab · d164bab
1 parent 0682954
commit d164bab
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/counterparty-core/counterpartycore/lib/messages/dispenser.py b/counterparty-core/counterpartycore/lib/messages/dispenser.py
@@ -20,8 +20,8 @@
     message_type,
     util,
 )
-from counterpartycore.lib.tools.address import pack as address_pack
-from counterpartycore.lib.tools.address import unpack as address_unpack
+from counterpartycore.lib.messages.utils.address import pack as address_pack
+from counterpartycore.lib.messages.utils.address import unpack as address_unpack
 
 logger = logging.getLogger(config.LOGGER_NAME)
 

diff --git a/counterparty-core/counterpartycore/lib/messages/sweep.py b/counterparty-core/counterpartycore/lib/messages/sweep.py
@@ -12,7 +12,7 @@
     util,
 )
 from counterpartycore.lib.exceptions import *  # noqa: F403
-from counterpartycore.lib.tools import address
+from counterpartycore.lib.messages.utils import address
 
 logger = logging.getLogger(config.LOGGER_NAME)
 

diff --git a/...e/lib/messages/versions/utils/__init__.py → ...rpartycore/lib/messages/utils/__init__.py b/...e/lib/messages/versions/utils/__init__.py → ...rpartycore/lib/messages/utils/__init__.py
diff --git a/...ore/counterpartycore/lib/tools/address.py → ...erpartycore/lib/messages/utils/address.py b/...ore/counterpartycore/lib/tools/address.py → ...erpartycore/lib/messages/utils/address.py
@@ -1,6 +1,7 @@
 import logging
 
 import bitcoin
+
 from counterpartycore.lib import config, exceptions, script  # noqa: F401
 
 logger = logging.getLogger(config.LOGGER_NAME)

diff --git a/.../messages/versions/utils/mpma_encoding.py → ...ycore/lib/messages/utils/mpma_encoding.py b/.../messages/versions/utils/mpma_encoding.py → ...ycore/lib/messages/utils/mpma_encoding.py
@@ -5,7 +5,7 @@
 from bitstring import BitArray, ConstBitStream
 
 from counterpartycore.lib import config, exceptions, ledger
-from counterpartycore.lib.tools import address
+from counterpartycore.lib.messages.utils import address
 
 logger = logging.getLogger(config.LOGGER_NAME)
 

diff --git a/counterparty-core/counterpartycore/lib/messages/versions/enhanced_send.py b/counterparty-core/counterpartycore/lib/messages/versions/enhanced_send.py
@@ -4,8 +4,8 @@
 import struct
 
 from counterpartycore.lib import config, exceptions, ledger, message_type, util
+from counterpartycore.lib.messages.utils import address
 from counterpartycore.lib.messages.versions import send1
-from counterpartycore.lib.tools import address
 
 logger = logging.getLogger(config.LOGGER_NAME)
 

diff --git a/counterparty-core/counterpartycore/lib/messages/versions/mpma.py b/counterparty-core/counterpartycore/lib/messages/versions/mpma.py
@@ -12,8 +12,10 @@
 from bitstring import ReadError
 
 from counterpartycore.lib import config, exceptions, ledger, message_type, util
-
-from .utils.mpma_encoding import _decode_mpma_send_decode, _encode_mpma_send
+from counterpartycore.lib.messages.utils.mpma_encoding import (
+    _decode_mpma_send_decode,
+    _encode_mpma_send,
+)
 
 logger = logging.getLogger(config.LOGGER_NAME)
 

diff --git a/counterparty-core/counterpartycore/test/fixtures/contract_vectors/address.py b/counterparty-core/counterpartycore/test/fixtures/contract_vectors/address.py
@@ -3,7 +3,7 @@
 from counterpartycore.lib import config
 
 ADDRESS_VECTOR = {
-    "tools.address": {
+    "messages.utils.address": {
         "pack": [
             {
                 "config_context": {"ADDRESSVERSION": config.ADDRESSVERSION_MAINNET},

diff --git a/counterparty-core/counterpartycore/test/util_test.py b/counterparty-core/counterpartycore/test/util_test.py
@@ -844,7 +844,7 @@ def exec_tested_method(tx_name, method, tested_method, inputs, server_db):
             "transaction_helper.transaction_outputs",
             "backend",
             "message_type",
-            "tools.address",
+            "messages.utils.address",
         ]
         or (
             tx_name == "composer"