Revert "Bring in loglevel changes in chainlib, bump version"

This reverts commit 677b742690.
This commit is contained in:
lash 2022-01-21 00:15:33 +00:00
parent 677b742690
commit 8ac349f092
4 changed files with 3 additions and 10 deletions

View File

@ -1,8 +1,3 @@
- 0.0.19:
* Add delay on eth-wait cli tool
(changelog incomplete below here)
- 0.0.15: - 0.0.15:
* Correct inverted addess checksum check for gas cli * Correct inverted addess checksum check for gas cli
- 0.0.5-unreleased: - 0.0.5-unreleased:

View File

@ -51,7 +51,6 @@ config_dir = os.path.join(script_dir, '..', 'data', 'config')
arg_flags = chainlib.eth.cli.argflag_std_read arg_flags = chainlib.eth.cli.argflag_std_read
argparser = chainlib.eth.cli.ArgumentParser(arg_flags) argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
argparser.add_argument('--delay', type=float, default=0.5, help='Delay between polls')
argparser.add_argument('--ignore', type=str, action='append', default=[], help='Ignore error from the given transaction') argparser.add_argument('--ignore', type=str, action='append', default=[], help='Ignore error from the given transaction')
argparser.add_argument('--ignore-all', action='store_true', dest='ignore_all', help='Ignore errors from all transactions') argparser.add_argument('--ignore-all', action='store_true', dest='ignore_all', help='Ignore errors from all transactions')
argparser.add_positional('hashes', append=True, type=str, help='Transaction hashes to wait for') argparser.add_positional('hashes', append=True, type=str, help='Transaction hashes to wait for')
@ -60,7 +59,6 @@ extra_args = {
'ignore': None, 'ignore': None,
'ignore_all': None, 'ignore_all': None,
'hashes': None, 'hashes': None,
'delay': None,
} }
config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_config_dir=config_dir) config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_config_dir=config_dir)
@ -101,7 +99,7 @@ def main():
for hsh in hashes_ready: for hsh in hashes_ready:
logg.debug('processing transaction hash {}'.format(hsh)) logg.debug('processing transaction hash {}'.format(hsh))
try: try:
r = conn.wait(hsh, delay=config.get('_DELAY')) r = conn.wait(hsh)
except RevertEthException: except RevertEthException:
if config.get('_IGNORE_ALL') or hsh in hashes_ignore: if config.get('_IGNORE_ALL') or hsh in hashes_ignore:
logg.info('ignoring revert in transaction hash {}'.format(hsh)) logg.info('ignoring revert in transaction hash {}'.format(hsh))

View File

@ -3,5 +3,5 @@ pysha3==1.0.2
hexathon~=0.1.1 hexathon~=0.1.1
websocket-client==0.57.0 websocket-client==0.57.0
potaahto~=0.1.0 potaahto~=0.1.0
chainlib~=0.0.17 chainlib~=0.0.16
confini~=0.5.2 confini~=0.5.2

View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = chainlib-eth name = chainlib-eth
version = 0.0.20 version = 0.0.18
description = Ethereum implementation of the chainlib interface description = Ethereum implementation of the chainlib interface
author = Louis Holbrook author = Louis Holbrook
author_email = dev@holbrook.no author_email = dev@holbrook.no