fix: Contract name underscoring #237
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
pbukva
requested review from
jrriehl,
ejfitzgerald,
MissingNO57 and
Alejandro-Morales
pbukva
commented
Mar 19, 2024
src/jenesis/contracts/__init__.py
Outdated
|
|
||
| def __post_init__(self): | ||
| self.variable_name = self.name.replace("-", "_") |
There was a problem hiding this comment.
This is one of the most relevant changes.
pbukva
commented
Mar 19, 2024
| @@ -30,7 +30,7 @@ def parse_contract(path: str, name: str) -> Contract: | |||
| cargo_contents = toml.load(cargo_file) | |||
|
|
|||
| # extract the contract name and replace hyphens with underscores | |||
| contract_name = cargo_contents['package']['name'].replace("-", "_") | |||
| contract_name = cargo_contents['package']['name'] | |||
There was a problem hiding this comment.
This is another most relevant change.
pbukva
commented
Mar 19, 2024
| @@ -38,7 +38,7 @@ def load_shell_globals(cfg: Config, selected_profile: Profile) -> dict: | |||
| shell_globals = {} | |||
| contract_instances = {} | |||
|
|
|||
| contracts = {contract.name: contract for contract in detect_contracts(PROJECT_PATH)} | |||
| contracts = {contract.variable_name: contract for contract in detect_contracts(PROJECT_PATH)} | |||
There was a problem hiding this comment.
This is the most relevant change.
MissingNO57
reviewed
Mar 20, 2024
| @@ -24,6 +24,7 @@ jsonschema = "^4.15.0" | |||
| graphlib-backport = "^1.0.3" | |||
| jwskate = ">=0.4.1,<0.6.0" | |||
| makefun = "^1.15.0" | |||
| urllib3 = "==1.26.16" | |||
There was a problem hiding this comment.
I was getting Docker error with newer version of urllib3. We shouldn't restrict it to only one exact version and we need to find a range of versions.
Traceback (most recent call last):
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/api/client.py", line 214, in _retrieve_server_version
return self.version(api_version=False)["ApiVersion"]
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/api/daemon.py", line 181, in version
return self._result(self._get(url), json=True)
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/utils/decorators.py", line 46, in inner
return f(self, *args, **kwargs)
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/api/client.py", line 237, in _get
return self.get(url, **self._set_request_timeout(kwargs))
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/requests/sessions.py", line 602, in get
return self.request("GET", url, **kwargs)
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/requests/sessions.py", line 589, in request
resp = self.send(prep, **send_kwargs)
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/requests/sessions.py", line 703, in send
r = adapter.send(request, **kwargs)
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/requests/adapters.py", line 486, in send
resp = conn.urlopen(
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/urllib3/connectionpool.py", line 793, in urlopen
response = self._make_request(
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/urllib3/connectionpool.py", line 496, in _make_request
conn.request(
TypeError: HTTPConnection.request() got an unexpected keyword argument 'chunked'
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/bin/jenesis", line 5, in <module>
from jenesis.cli import main
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/src/jenesis/src/jenesis/cli.py", line 6, in <module>
from jenesis.cmd.compile import add_compile_command
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/src/jenesis/src/jenesis/cmd/compile.py", line 13, in <module>
from jenesis.tasks.image import image_exists, pull_image
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/src/jenesis/src/jenesis/tasks/image.py", line 13, in <module>
image_collection = ImageCollection(from_env())
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/client.py", line 96, in from_env
return cls(
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/client.py", line 45, in __init__
self.api = APIClient(*args, **kwargs)
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/api/client.py", line 197, in __init__
self._version = self._retrieve_server_version()
File "/home/jiri/.local/share/virtualenvs/contract-fetch-compute-credit-cw20-gQdo6jWW/lib/python3.10/site-packages/docker/api/client.py", line 221, in _retrieve_server_version
raise DockerException(
docker.errors.DockerException: Error while fetching server API version: HTTPConnection.request() got an unexpected keyword argument 'chunked'
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.
No description provided.