Contract Caller Cleaned up #1227
Merged
Conversation
This file contains hidden or 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
rename transaction_dict for consistency
Remove unneeded args and kwargs
pipermerriam
approved these changes
Jan 30, 2019
web3/contract.py
Outdated
| "The abi for this contract contains no function definitions. ", | ||
| "Are you sure you provided the correct contract abi?" | ||
| ) | ||
| elif function_name not in self.__dict__['_functions']: |
There was a problem hiding this comment.
These conditionals can get away from accessing self.__dict__ if we instead define these attributes to default to None on the class which should also have the benefit of being more precise checks.
if self.abi is None:
# no abi
elif len(self._functions) == 0:
# no functions in the abi
elif function_name not in self._functions:
# no matching function
There was a problem hiding this comment.
I like that. I think it's updated to what you recommended, but let me know if it's not!
Change none_or_zero_address to is_none_or_zero_address
pipermerriam
approved these changes
Feb 1, 2019
carver
approved these changes
Feb 5, 2019
docs/contracts.rst
Outdated
| >>> twentyone = myContract.caller({'from': from_address}).multiply7(3) | ||
| >>> twentyone | ||
| 21 | ||
| >>> twentyone = myContract.caller(transaction_dict={'from': from_address}).multiply7(3) |
There was a problem hiding this comment.
Maybe one more example that includes block_identifier?
| 'gasPrice': web3.toWei(.001, 'ether'), | ||
| 'value': 12345, | ||
| } | ||
| contract = return_args_contract.caller(transaction_dict=transaction_dict) |
There was a problem hiding this comment.
This dict has been called transaction in enough other places that I think it's more consistent to just use transaction instead of transaction_dict as the keyword argument name.
Make caller tests better
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 should be the same diff as the original Contract Caller PR (#1157), but branched off of the tip of master since the original had been open so long. There were some really nasty merge conflicts that made for ugly history
What was wrong?
Want to deprecate ConciseContract and ImplicitContract in favor of a ContractCaller. There are more details in the issue linked below.
Related to Issue #
#1025
How was it fixed?
Added a new ContractCaller class and added deprecation methods to ConciseContract and ImplicitContract.
See #1157
Cute Animal Picture