Update tezos-utils #351
Open
Update tezos-utils #351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sskeirik
force-pushed
the
update_tezos_utils
branch
from
08c0f42 to
80940ad
Compare
sskeirik
force-pushed
the
update_tezos_utils
branch
from
80940ad to
f711cba
Compare
tothtamas28
requested changes
May 2, 2022
| @@ -23,6 +23,11 @@ On Ubuntu Linux derivatives, the system dependencies include: | |||
| For other distributions, you will need to find the appropriate packages. | |||
|
|
|||
| The Python dependencies are all available available via PyPI packages and can be installed via `pip`: | |||
There was a problem hiding this comment.
Suggested change
| The Python dependencies are all available available via PyPI packages and can be installed via `pip`: | |
| The Python dependencies are all available via PyPI packages and can be installed via `pip`: |
| @@ -215,9 +234,9 @@ def is_micheline(mcode): | |||
| else: | |||
| return False | |||
|
|
|||
| def micheline_to_dot(mcode, skipRevert = False): | |||
| def micheline_to_dot(mcode, skipRevert = False, type_length=None): | |||
There was a problem hiding this comment.
Suggested change
| def micheline_to_dot(mcode, skipRevert = False, type_length=None): | |
| def micheline_to_dot(mcode, skipRevert=False, type_length=None): |
| # check that section names are correct | ||
| sections = dict() | ||
| for prim in mcode: | ||
| name,val = prim['prim'], prim['args'] | ||
| # skip view functions | ||
| if name == 'view': continue | ||
| # if we encounter an unexpected name, stop | ||
| if name not in ['parameter', 'storage', 'code'] or name in sections.keys(): |
There was a problem hiding this comment.
Suggested change
| if name not in ['parameter', 'storage', 'code'] or name in sections.keys(): | |
| if name not in {'parameter', 'storage', 'code'} or name in sections: |
Comment on lines
+24
to
+26
| def truncate(s, l): | ||
| if len(s) <= l: return s | ||
| else: return s[:l] + "..." |
There was a problem hiding this comment.
Suggested change
| def truncate(s, l): | |
| if len(s) <= l: return s | |
| else: return s[:l] + "..." | |
| def truncate(s, length): | |
| if len(s) <= length: | |
| return s | |
| else: | |
| return s[:length] + "..." |
| class BlockType(Enum): | ||
| STD = 1 | ||
| SELFBREAK = 2 | ||
| BREAK = 3 | ||
| JOIN = 4 | ||
|
|
||
| class Block: | ||
| def __init__(self, prim_seq, depth=0): | ||
| def __init__(self, prim_seq, depth=0, type_length=None): |
There was a problem hiding this comment.
Consider making the optional arguments keyword-only:
Suggested change
| def __init__(self, prim_seq, depth=0, type_length=None): | |
| def __init__(self, prim_seq, *, depth=0, type_length=None): |
| @@ -135,7 +140,7 @@ class Block: | |||
|
|
|||
| elif name in HIDDEN_BLOCK_INSTRS: | |||
| self.append(prim) | |||
| hidden_block = Block({'prim' : '...' }, depth=self.depth) | |||
| hidden_block = Block({'prim' : '...' }, depth=self.depth, type_length=self.type_length) | |||
There was a problem hiding this comment.
Suggested change
| hidden_block = Block({'prim' : '...' }, depth=self.depth, type_length=self.type_length) | |
| hidden_block = Block({'prim' : '...'}, depth=self.depth, type_length=self.type_length) |
| @@ -200,6 +218,7 @@ def get_code_section(mcode): | |||
| code = sections['code'][0] | |||
| logging.debug(f"Get code section: {code}") | |||
| return code | |||
| logging.debug("The code was not a JSON-encoded Micheline representation of a contract; fallback") | |||
There was a problem hiding this comment.
Suggested change
| logging.debug("The code was not a JSON-encoded Micheline representation of a contract; fallback") | |
| logging.debug("The code is not a JSON-encoded Micheline representation of a contract; fallback") |
sskeirik
force-pushed
the
update_tezos_utils
branch
from
bafe90a to
fff3cfc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This update solves three problems with tezos-utils which makes it more usable for more kinds of programs:
@tothtamas28 I have currently assigned this to you since you know python well and are working on a Michelson-related audit with me. If you aren't able to review this or if you have questions, let me know.