Simplify contract manager #169
Merged
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
ulope
force-pushed
the
refactor_contractmgr
branch
6 times, most recently
from
777381b
to
25bbca7
Compare
ulope
force-pushed
the
refactor_contractmgr
branch
from
25bbca7
to
962c6bb
Compare
palango
approved these changes
Jul 6, 2018
raiden_contracts/contract_manager.py
Outdated
| for contracts_dir in self._contracts_source_dirs.values(): | ||
| res = compile_files( | ||
| [str(file) for file in contracts_dir.glob('*.sol')], | ||
| output_values=('abi', 'bin', 'ast'), |
There was a problem hiding this comment.
Not sure why we added the AST in the first place. @pcppcp any idea? We can remove this otherwise.
There was a problem hiding this comment.
not sure, maybe some weird solc behavior that required enabling this option.
There was a problem hiding this comment.
@ulope Can you check if it works without ast?
There was a problem hiding this comment.
Yep, it's 'required' (i.e. crashes when ast isn't included) by py-solc.
Filed an issue for it.
raiden_contracts/contract_manager.py
Outdated
| raise Exception('Could not compile the contract. Check that solc is available.') | ||
| raise RuntimeError( | ||
| 'Could not compile the contract. Check that solc is available.', | ||
| ) from FileNotFoundError |
There was a problem hiding this comment.
Shouldn't that be or does it work your was as well?
except FileNotFoundError as e:
raise Exception('Could not compile the contract. Check that solc is available.')
raise RuntimeError(
'Could not compile the contract. Check that solc is available.',
) from eThere was a problem hiding this comment.
Err, yeah... thanks for noticing.
ulope
force-pushed
the
refactor_contractmgr
branch
from
962c6bb
to
30dbfee
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 is a small refactor of the
ContractManagerin preparation for raiden-network/raiden#1550. Also fixes #125.