Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RPC] Update with latest cryptol_client, fix types #1550

Merged
merged 12 commits into from
Jan 4, 2022
Merged

[RPC] Update with latest cryptol_client, fix types #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
af8fbe0
WIP on quoted cryptol in SAW python
m-yac Dec 1, 2021
642b963
finish using `cry_f` and `cry` in SAW python tests
m-yac Dec 3, 2021
e77455b
fix types to get mypy passing
m-yac Dec 3, 2021
ac81c6d
update to cryptol_client 2.12.2, add JSON type
m-yac Dec 23, 2021
b4e5fce
Merge branch 'master' into rpc/quoted-cryptol
m-yac Dec 23, 2021
ab2d646
add precondition_f, postcondition_f, returns_f, update tests
m-yac Dec 23, 2021
bacdc58
fix type of `prove` for mypy
m-yac Dec 23, 2021
aedd4ce
improve comments, revert some types, import cry_f from crucible in tests
m-yac Dec 24, 2021
53f106f
whoops, fix imports in drbg.py
m-yac Dec 24, 2021
2f7645a
Merge branch 'master' into rpc/quoted-cryptol
m-yac Dec 24, 2021
4705427
Update saw-remote-api/python/saw_client/crucible.py
Jan 3, 2022
a82497e
Merge branch 'master' into rpc/quoted-cryptol
m-yac Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/cryptol
Open in desktop
Submodule cryptol updated 9 files
+5 −1 cryptol-remote-api/python/CHANGELOG.md
+224 −296 cryptol-remote-api/python/cryptol/cryptoltypes.py
+3 −15 cryptol-remote-api/python/cryptol/opaque.py
+1 −1 cryptol-remote-api/python/cryptol/single_connection.py
+2 −2 cryptol-remote-api/python/cryptol/synchronous.py
+1 −1 cryptol-remote-api/python/pyproject.toml
+3 −0 cryptol-remote-api/python/tests/cryptol/test-files/Types.cry
+2 −1 cryptol-remote-api/python/tests/cryptol/test_basics.py
+29 −1 cryptol-remote-api/python/tests/cryptol/test_types.py
44 changes: 22 additions & 22 deletions saw-remote-api/python/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions saw-remote-api/python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include = [
python = "^3.8"
requests = "^2.25.1"
BitVector = "^3.4.9"
cryptol = "2.12.0" # { path = "../../deps/cryptol/cryptol-remote-api/python/", develop = true }
argo-client = "~0.0.6"
cryptol = "2.12.2" # { path = "../../deps/cryptol/cryptol-remote-api/python/", develop = true }
argo-client = "0.0.10"

[tool.poetry.dev-dependencies]
mypy = "^0.812"
Expand Down
3 changes: 1 addition & 2 deletions saw-remote-api/python/saw_client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,8 +633,7 @@ def prove(goal: cryptoltypes.CryptolJSON,
argument.
"""
conn = __get_designated_connection()
res = conn.prove(cryptoltypes.to_cryptol(goal),
proof_script.to_json()).result()
res = conn.prove(goal, proof_script.to_json()).result()
pr = ProofResult()
if res['status'] == 'valid':
pr.valid = True
Expand Down
2 changes: 1 addition & 1 deletion saw-remote-api/python/saw_client/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def __init__(
goal : cryptoltypes.CryptolJSON,
script : ProofScript,
timeout : Optional[float]) -> None:
params = {'goal': goal,
params = {'goal': cryptoltypes.to_cryptol(goal),
'script': script}
super(Prove, self).__init__('SAW/prove', params, connection, timeout=timeout)

Expand Down
Loading