From e178bdc732c4ab72bbcf3d64feb4f23636da26cc Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 6 Apr 2023 09:13:57 +0000 Subject: [PATCH] proto.eth: class rename: TokenResolve -> ResolvedToken --- mmgen/proto/eth/contract.py | 2 +- mmgen/proto/eth/tw/ctl.py | 4 ++-- mmgen/tool/api.py | 3 +++ test/test_py_d/ts_ethdev.py | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mmgen/proto/eth/contract.py b/mmgen/proto/eth/contract.py index 56863f4e..e77d56b0 100755 --- a/mmgen/proto/eth/contract.py +++ b/mmgen/proto/eth/contract.py @@ -163,7 +163,7 @@ class Token(TokenCommon): self.base_unit = Decimal('10') ** -self.decimals self.rpc = rpc -class TokenResolve(TokenCommon,metaclass=AsyncInit): +class ResolvedToken(TokenCommon,metaclass=AsyncInit): async def __init__(self,cfg,proto,rpc,addr): from ...util2 import get_keccak diff --git a/mmgen/proto/eth/tw/ctl.py b/mmgen/proto/eth/tw/ctl.py index 095d79f4..6a40499f 100755 --- a/mmgen/proto/eth/tw/ctl.py +++ b/mmgen/proto/eth/tw/ctl.py @@ -23,7 +23,7 @@ proto.eth.tw.ctl: Ethereum tracking wallet control class from ....util import msg,ymsg,die from ....tw.ctl import TwCtl,write_mode from ....addr import is_coin_addr,is_mmgen_id -from ..contract import Token,TokenResolve +from ..contract import Token,ResolvedToken class EthereumTwCtl(TwCtl): @@ -232,7 +232,7 @@ class EthereumTokenTwCtl(EthereumTwCtl): once, upon token import. Thereafter, token address, symbol and decimals are resolved either from the tracking wallet (online operations) or transaction file (when signing). """ - t = await TokenResolve(self.cfg,self.proto,self.rpc,tokenaddr) + t = await ResolvedToken(self.cfg,self.proto,self.rpc,tokenaddr) self.data['tokens'][tokenaddr] = { 'params': { 'symbol': await t.get_symbol(), diff --git a/mmgen/tool/api.py b/mmgen/tool/api.py index 6b3b8062..9ed0a3a0 100755 --- a/mmgen/tool/api.py +++ b/mmgen/tool/api.py @@ -61,6 +61,9 @@ class tool_api( # Generate a random LTC testnet Bech32 keypair: wif,addr = tool.randpair() + + print('wif: ',wif) + print('addr:',addr) """ need_proto = True diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py index 3ffcd845..6ebb21c6 100755 --- a/test/test_py_d/ts_ethdev.py +++ b/test/test_py_d/ts_ethdev.py @@ -972,10 +972,10 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): from mmgen.tool.wallet import tool_cmd usr_mmaddrs = [f'{sid}:E:{i}' for i in (11,21)] - from mmgen.proto.eth.contract import TokenResolve + from mmgen.proto.eth.contract import ResolvedToken async def do_transfer(rpc): for i in range(2): - tk = await TokenResolve( + tk = await ResolvedToken( cfg, self.proto, rpc, @@ -997,7 +997,7 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): async def show_bals(rpc): for i in range(2): - tk = await TokenResolve( + tk = await ResolvedToken( cfg, self.proto, rpc,