From 20c0c372d04f84ee79f0ff06a6ff6c1b8c8454f1 Mon Sep 17 00:00:00 2001 From: tecnovert Date: Tue, 9 Aug 2022 00:10:37 +0200 Subject: [PATCH] refactor: Move all coin interfaces to a dir --- basicswap/basicswap.py | 12 ++++++------ basicswap/interface/__init__.py | 0 .../{interface_btc.py => interface/btc.py} | 18 +++++++++--------- .../{interface_ltc.py => interface/ltc.py} | 4 ++-- .../{interface_nmc.py => interface/nmc.py} | 6 +++--- .../{interface_part.py => interface/part.py} | 14 +++++++------- .../passthrough_btc.py} | 4 ++-- .../{interface_xmr.py => interface/xmr.py} | 8 ++++---- tests/basicswap/test_other.py | 4 ++-- tests/basicswap/test_xmr.py | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 basicswap/interface/__init__.py rename basicswap/{interface_btc.py => interface/btc.py} (99%) rename basicswap/{interface_ltc.py => interface/ltc.py} (81%) rename basicswap/{interface_nmc.py => interface/nmc.py} (93%) rename basicswap/{interface_part.py => interface/part.py} (99%) rename basicswap/{interface_passthrough_btc.py => interface/passthrough_btc.py} (86%) rename basicswap/{interface_xmr.py => interface/xmr.py} (99%) diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py index c86250d..4bb2ca4 100644 --- a/basicswap/basicswap.py +++ b/basicswap/basicswap.py @@ -27,12 +27,12 @@ import concurrent.futures from sqlalchemy.orm import sessionmaker, scoped_session from sqlalchemy.orm.session import close_all_sessions -from .interface_part import PARTInterface, PARTInterfaceAnon, PARTInterfaceBlind -from .interface_btc import BTCInterface -from .interface_ltc import LTCInterface -from .interface_nmc import NMCInterface -from .interface_xmr import XMRInterface -from .interface_passthrough_btc import PassthroughBTCInterface +from .interface.part import PARTInterface, PARTInterfaceAnon, PARTInterfaceBlind +from .interface.btc import BTCInterface +from .interface.ltc import LTCInterface +from .interface.nmc import NMCInterface +from .interface.xmr import XMRInterface +from .interface.passthrough_btc import PassthroughBTCInterface from . import __version__ from .rpc_xmr import make_xmr_rpc2_func diff --git a/basicswap/interface/__init__.py b/basicswap/interface/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/basicswap/interface_btc.py b/basicswap/interface/btc.py similarity index 99% rename from basicswap/interface_btc.py rename to basicswap/interface/btc.py index cfcea9e..7ba205e 100644 --- a/basicswap/interface_btc.py +++ b/basicswap/interface/btc.py @@ -14,22 +14,22 @@ import traceback from io import BytesIO from basicswap.contrib.test_framework import segwit_addr -from .util import ( +from basicswap.util import ( dumpj, ensure, make_int, b2h, i2b, b2i, i2h) -from .util.ecc import ( +from basicswap.util.ecc import ( ep, pointToCPK, CPKToPoint, getSecretInt) -from .util.script import ( +from basicswap.util.script import ( decodeScriptNum, getCompactSizeLen, SerialiseNumCompact, getWitnessElementLen, ) -from .util.address import ( +from basicswap.util.address import ( toWIF, b58encode, decodeWif, @@ -47,7 +47,7 @@ from coincurve.ecdsaotves import ( ecdsaotves_dec_sig, ecdsaotves_rec_enc_key) -from .contrib.test_framework.messages import ( +from basicswap.contrib.test_framework.messages import ( COIN, COutPoint, CTransaction, @@ -56,7 +56,7 @@ from .contrib.test_framework.messages import ( CTxOut, FromHex) -from .contrib.test_framework.script import ( +from basicswap.contrib.test_framework.script import ( CScript, CScriptOp, OP_IF, OP_ELSE, OP_ENDIF, OP_0, OP_2, @@ -68,11 +68,11 @@ from .contrib.test_framework.script import ( SegwitV0SignatureHash, hash160) -from .basicswap_util import ( +from basicswap.basicswap_util import ( TxLockTypes) -from .chainparams import CoinInterface, Coins -from .rpc import make_rpc_func, openrpc +from basicswap.chainparams import CoinInterface, Coins +from basicswap.rpc import make_rpc_func, openrpc SEQUENCE_LOCKTIME_GRANULARITY = 9 # 512 seconds diff --git a/basicswap/interface_ltc.py b/basicswap/interface/ltc.py similarity index 81% rename from basicswap/interface_ltc.py rename to basicswap/interface/ltc.py index 064f5d0..979265f 100644 --- a/basicswap/interface_ltc.py +++ b/basicswap/interface/ltc.py @@ -5,8 +5,8 @@ # Distributed under the MIT software license, see the accompanying # file LICENSE or http://www.opensource.org/licenses/mit-license.php. -from .interface_btc import BTCInterface -from .chainparams import Coins +from .btc import BTCInterface +from basicswap.chainparams import Coins class LTCInterface(BTCInterface): diff --git a/basicswap/interface_nmc.py b/basicswap/interface/nmc.py similarity index 93% rename from basicswap/interface_nmc.py rename to basicswap/interface/nmc.py index cdb756b..711dc50 100644 --- a/basicswap/interface_nmc.py +++ b/basicswap/interface/nmc.py @@ -5,9 +5,9 @@ # Distributed under the MIT software license, see the accompanying # file LICENSE or http://www.opensource.org/licenses/mit-license.php. -from .interface_btc import BTCInterface -from .chainparams import Coins -from .util import ( +from .btc import BTCInterface +from basicswap.chainparams import Coins +from basicswap.util import ( make_int, ) diff --git a/basicswap/interface_part.py b/basicswap/interface/part.py similarity index 99% rename from basicswap/interface_part.py rename to basicswap/interface/part.py index 81de26c..06b28dc 100644 --- a/basicswap/interface_part.py +++ b/basicswap/interface/part.py @@ -8,30 +8,30 @@ import hashlib from enum import IntEnum -from .contrib.test_framework.messages import ( +from basicswap.contrib.test_framework.messages import ( CTxOutPart, ) -from .contrib.test_framework.script import ( +from basicswap.contrib.test_framework.script import ( CScript, OP_0, OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG ) -from .util import ( +from basicswap.util import ( i2b, ensure, make_int, TemporaryError, ) -from .util.script import ( +from basicswap.util.script import ( getP2WSH, getCompactSizeLen, getWitnessElementLen, ) -from .util.address import ( +from basicswap.util.address import ( toWIF, encodeStealthAddress) -from .chainparams import Coins, chainparams -from .interface_btc import BTCInterface +from basicswap.chainparams import Coins, chainparams +from .btc import BTCInterface class BalanceTypes(IntEnum): diff --git a/basicswap/interface_passthrough_btc.py b/basicswap/interface/passthrough_btc.py similarity index 86% rename from basicswap/interface_passthrough_btc.py rename to basicswap/interface/passthrough_btc.py index 2673aa8..c7fa214 100644 --- a/basicswap/interface_passthrough_btc.py +++ b/basicswap/interface/passthrough_btc.py @@ -5,8 +5,8 @@ # Distributed under the MIT software license, see the accompanying # file LICENSE or http://www.opensource.org/licenses/mit-license.php. -from .interface_btc import BTCInterface -from .contrib.test_framework.messages import ( +from .btc import BTCInterface +from basicswap.contrib.test_framework.messages import ( CTxOut) diff --git a/basicswap/interface_xmr.py b/basicswap/interface/xmr.py similarity index 99% rename from basicswap/interface_xmr.py rename to basicswap/interface/xmr.py index 6e1d15a..636b90a 100644 --- a/basicswap/interface_xmr.py +++ b/basicswap/interface/xmr.py @@ -24,18 +24,18 @@ from coincurve.dleag import ( verify_ed25519_point, ) -from .util import ( +from basicswap.util import ( dumpj, ensure, make_int, TemporaryError) -from .rpc_xmr import ( +from basicswap.rpc_xmr import ( make_xmr_rpc_func, make_xmr_rpc2_func, make_xmr_wallet_rpc_func) -from .util import ( +from basicswap.util import ( b2i, b2h) -from .chainparams import XMR_COIN, CoinInterface, Coins +from basicswap.chainparams import XMR_COIN, CoinInterface, Coins class XMRInterface(CoinInterface): diff --git a/tests/basicswap/test_other.py b/tests/basicswap/test_other.py index f83a8c8..ff3c652 100644 --- a/tests/basicswap/test_other.py +++ b/tests/basicswap/test_other.py @@ -24,8 +24,8 @@ from coincurve.keys import ( from basicswap.util import i2b, h2b from basicswap.util.crypto import ripemd160 from basicswap.util.rfc2440 import rfc2440_hash_password -from basicswap.interface_btc import BTCInterface -from basicswap.interface_xmr import XMRInterface +from basicswap.interface.btc import BTCInterface +from basicswap.interface.xmr import XMRInterface from basicswap.basicswap_util import ( TxLockTypes) diff --git a/tests/basicswap/test_xmr.py b/tests/basicswap/test_xmr.py index 522c244..4b778ea 100644 --- a/tests/basicswap/test_xmr.py +++ b/tests/basicswap/test_xmr.py @@ -48,7 +48,7 @@ from basicswap.rpc_xmr import ( callrpc_xmr, callrpc_xmr_na, ) -from basicswap.interface_xmr import ( +from basicswap.interface.xmr import ( XMR_COIN, ) from basicswap.contrib.key import (