From 769f96aad700d698b161b82a0296cd2a406052c1 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 27 Jan 2022 11:08:06 +0000 Subject: [PATCH] altcoins.eth: use relative imports --- mmgen/altcoins/eth/contract.py | 16 ++++++++-------- mmgen/altcoins/eth/tw.py | 6 +++--- mmgen/altcoins/eth/twaddrs.py | 8 ++++---- mmgen/altcoins/eth/twbal.py | 4 ++-- mmgen/altcoins/eth/twctl.py | 12 ++++++------ mmgen/altcoins/eth/tx.py | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mmgen/altcoins/eth/contract.py b/mmgen/altcoins/eth/contract.py index b957f742..be73be1e 100755 --- a/mmgen/altcoins/eth/contract.py +++ b/mmgen/altcoins/eth/contract.py @@ -23,12 +23,12 @@ altcoins.eth.contract: Ethereum contract and token classes for the MMGen suite from decimal import Decimal from . import rlp -from mmgen.util import msg,pp_msg -from mmgen.globalvars import g -from mmgen.base_obj import AsyncInit -from mmgen.obj import MMGenObject,CoinTxID -from mmgen.addr import CoinAddr,TokenAddr -from mmgen.amt import ETHAmt +from ...util import msg,pp_msg +from ...globalvars import g +from ...base_obj import AsyncInit +from ...obj import MMGenObject,CoinTxID +from ...addr import CoinAddr,TokenAddr +from ...amt import ETHAmt def parse_abi(s): return [s[:8]] + [s[8+x*64:8+(x+1)*64] for x in range(len(s[8:])//64)] @@ -152,7 +152,7 @@ class Token(TokenBase): def __init__(self,proto,addr,decimals,rpc=None): if type(self).__name__ == 'Token': - from mmgen.util import get_keccak + from ...util import get_keccak self.keccak_256 = get_keccak() self.proto = proto self.addr = TokenAddr(proto,addr) @@ -164,7 +164,7 @@ class Token(TokenBase): class TokenResolve(TokenBase,metaclass=AsyncInit): async def __init__(self,proto,rpc,addr): - from mmgen.util import get_keccak + from ...util import get_keccak self.keccak_256 = get_keccak() self.proto = proto self.rpc = rpc diff --git a/mmgen/altcoins/eth/tw.py b/mmgen/altcoins/eth/tw.py index e3786588..66bd3e57 100755 --- a/mmgen/altcoins/eth/tw.py +++ b/mmgen/altcoins/eth/tw.py @@ -20,13 +20,13 @@ altcoins.eth.tw: Ethereum tracking wallet dependency classes for the MMGen suite """ -from mmgen.addrdata import AddrData,TwAddrData +from ...addrdata import AddrData,TwAddrData class EthereumTwAddrData(TwAddrData): async def get_tw_data(self,wallet=None): - from mmgen.twctl import TrackingWallet - from mmgen.util import vmsg + from ...twctl import TrackingWallet + from ...util import vmsg vmsg('Getting address data from tracking wallet') tw = (wallet or await TrackingWallet(self.proto)).mmid_ordered_dict # emulate the output of RPC 'listaccounts' and 'getaddressesbyaccount' diff --git a/mmgen/altcoins/eth/twaddrs.py b/mmgen/altcoins/eth/twaddrs.py index 511e1b39..bd9204e3 100755 --- a/mmgen/altcoins/eth/twaddrs.py +++ b/mmgen/altcoins/eth/twaddrs.py @@ -20,7 +20,7 @@ altcoins.eth.twaddrs: Ethereum tracking wallet listaddresses class for the MMGen suite """ -from mmgen.twaddrs import TwAddrList +from ...twaddrs import TwAddrList class EthereumTwAddrList(TwAddrList): @@ -28,9 +28,9 @@ class EthereumTwAddrList(TwAddrList): async def __init__(self,proto,usr_addr_list,minconf,showempty,showbtcaddrs,all_labels,wallet=None): - from mmgen.tw import TwLabel - from mmgen.twctl import TrackingWallet - from mmgen.addr import CoinAddr + from ...tw import TwLabel + from ...twctl import TrackingWallet + from ...addr import CoinAddr self.proto = proto self.wallet = wallet or await TrackingWallet(self.proto,mode='w') diff --git a/mmgen/altcoins/eth/twbal.py b/mmgen/altcoins/eth/twbal.py index f93d36af..07e3a76c 100755 --- a/mmgen/altcoins/eth/twbal.py +++ b/mmgen/altcoins/eth/twbal.py @@ -20,8 +20,8 @@ altcoins.eth.twbal: Ethereum tracking wallet getbalance class for the MMGen suite """ -from mmgen.twctl import TrackingWallet -from mmgen.twbal import TwGetBalance +from ...twctl import TrackingWallet +from ...twbal import TwGetBalance class EthereumTwGetBalance(TwGetBalance): diff --git a/mmgen/altcoins/eth/twctl.py b/mmgen/altcoins/eth/twctl.py index 606b6631..1cb6d630 100755 --- a/mmgen/altcoins/eth/twctl.py +++ b/mmgen/altcoins/eth/twctl.py @@ -20,10 +20,10 @@ altcoins.eth.twctl: Ethereum tracking wallet control class for the MMGen suite """ -from mmgen.util import msg,ymsg,write_mode -from mmgen.twctl import TrackingWallet -from mmgen.addr import is_coin_addr,is_mmgen_id -from mmgen.amt import ETHAmt +from ...util import msg,ymsg,write_mode +from ...twctl import TrackingWallet +from ...addr import is_coin_addr,is_mmgen_id +from ...amt import ETHAmt from .contract import Token,TokenResolve class EthereumTrackingWallet(TrackingWallet): @@ -165,10 +165,10 @@ class EthereumTokenTrackingWallet(EthereumTrackingWallet): assert token_addr == None,'EthereumTokenTrackingWallet_chk1' token_addr = await self.sym2addr(proto.tokensym) # returns None on failure if not is_coin_addr(proto,token_addr): - from mmgen.exception import UnrecognizedTokenSymbol + from ...exception import UnrecognizedTokenSymbol raise UnrecognizedTokenSymbol(f'Specified token {proto.tokensym!r} could not be resolved!') - from mmgen.addr import TokenAddr + from ...addr import TokenAddr self.token = TokenAddr(proto,token_addr) if self.token not in self.data['tokens']: diff --git a/mmgen/altcoins/eth/tx.py b/mmgen/altcoins/eth/tx.py index 3e610178..dce2875e 100755 --- a/mmgen/altcoins/eth/tx.py +++ b/mmgen/altcoins/eth/tx.py @@ -276,7 +276,7 @@ class EthereumMMGenTX: \n""".replace('\t','') t = self.txobj td = t['data'] - from mmgen.color import yellow + from ...color import yellow return fs.format( *((t[k] if t[k] != '' else Str('None')).hl() for k in self.fmt_keys), d = '{}... ({} bytes)'.format(td[:40],len(td)//2) if len(td) else Str('None'),