diff --git a/squeaknode/blockchain/__init__.py b/squeaknode/bitcoin/__init__.py similarity index 100% rename from squeaknode/blockchain/__init__.py rename to squeaknode/bitcoin/__init__.py diff --git a/squeaknode/blockchain/bitcoin_blockchain_client.py b/squeaknode/bitcoin/bitcoin_blockchain_client.py similarity index 96% rename from squeaknode/blockchain/bitcoin_blockchain_client.py rename to squeaknode/bitcoin/bitcoin_blockchain_client.py index bba9c19a..2a12e8be 100644 --- a/squeaknode/blockchain/bitcoin_blockchain_client.py +++ b/squeaknode/bitcoin/bitcoin_blockchain_client.py @@ -4,8 +4,8 @@ from typing import Optional import requests -from squeaknode.blockchain.block_info import BlockInfo -from squeaknode.blockchain.blockchain_client import BlockchainClient +from squeaknode.bitcoin.block_info import BlockInfo +from squeaknode.bitcoin.blockchain_client import BlockchainClient logger = logging.getLogger(__name__) diff --git a/squeaknode/blockchain/block_info.py b/squeaknode/bitcoin/block_info.py similarity index 100% rename from squeaknode/blockchain/block_info.py rename to squeaknode/bitcoin/block_info.py diff --git a/squeaknode/blockchain/blockchain_client.py b/squeaknode/bitcoin/blockchain_client.py similarity index 84% rename from squeaknode/blockchain/blockchain_client.py rename to squeaknode/bitcoin/blockchain_client.py index e5e8f512..b647a59a 100644 --- a/squeaknode/blockchain/blockchain_client.py +++ b/squeaknode/bitcoin/blockchain_client.py @@ -1,7 +1,7 @@ import logging from abc import ABC, abstractmethod -from squeaknode.blockchain.block_info import BlockInfo +from squeaknode.bitcoin.block_info import BlockInfo logger = logging.getLogger(__name__) diff --git a/squeaknode/blockchain/util.py b/squeaknode/bitcoin/util.py similarity index 100% rename from squeaknode/blockchain/util.py rename to squeaknode/bitcoin/util.py diff --git a/squeaknode/db/models.py b/squeaknode/db/models.py index 88787897..053d0492 100644 --- a/squeaknode/db/models.py +++ b/squeaknode/db/models.py @@ -19,7 +19,6 @@ from sqlalchemy import ( from sqlalchemy.sql import and_, or_, select from squeak.core import CSqueak -from squeaknode.blockchain.util import parse_block_header from squeaknode.core.offer import Offer from squeaknode.core.offer_with_peer import OfferWithPeer from squeaknode.core.squeak_entry import SqueakEntry diff --git a/squeaknode/db/squeak_db.py b/squeaknode/db/squeak_db.py index 3a6db120..f31299a4 100644 --- a/squeaknode/db/squeak_db.py +++ b/squeaknode/db/squeak_db.py @@ -19,7 +19,7 @@ from sqlalchemy import ( from sqlalchemy.sql import and_, or_, select from squeak.core import CSqueak -from squeaknode.blockchain.util import parse_block_header +from squeaknode.bitcoin.util import parse_block_header from squeaknode.core.offer import Offer from squeaknode.core.offer_with_peer import OfferWithPeer from squeaknode.core.sent_payment_with_peer import SentPaymentWithPeer diff --git a/squeaknode/main.py b/squeaknode/main.py index 10ea7964..12da0488 100644 --- a/squeaknode/main.py +++ b/squeaknode/main.py @@ -11,7 +11,7 @@ from squeak.params import SelectParams from squeaknode.admin.squeak_admin_server_handler import SqueakAdminServerHandler from squeaknode.admin.squeak_admin_server_servicer import SqueakAdminServerServicer from squeaknode.admin.webapp.app import SqueakAdminWebServer -from squeaknode.blockchain.bitcoin_blockchain_client import BitcoinBlockchainClient +from squeaknode.bitcoin.bitcoin_blockchain_client import BitcoinBlockchainClient from squeaknode.common.lnd_lightning_client import LNDLightningClient from squeaknode.db.db_engine import get_engine, get_sqlite_connection_string from squeaknode.db.squeak_db import SqueakDb