WIP fix: bump argo submodule, fix unknown ID errors for RPC server

TODO: push argo to PyPI once that's finalized, bump cryptol to use that.
GaloisInc · Aug 30, 2021 · cfd90fb · cfd90fb
1 parent 0eea2cb
commit cfd90fb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/cryptol-remote-api/python/README.md b/cryptol-remote-api/python/README.md
@@ -90,10 +90,6 @@ used. Below is a brief summary:
 
 Additional arguments and options are documented with the function.
 
-Notably, the `reset_server` keyword can be used to connect to a running server
-and reset it, ensuring states from previous scripts have been cleared. E.g.,
-`cryptol.connect(reset_server=True)`.
-
 
 ## Acquiring a Cryptol Server
 

diff --git a/cryptol-remote-api/python/poetry.lock b/cryptol-remote-api/python/poetry.lock
diff --git a/cryptol-remote-api/python/pyproject.toml b/cryptol-remote-api/python/pyproject.toml
@@ -15,7 +15,8 @@ include = [
 python = ">=3.7.0"
 requests = "^2.25.1"
 BitVector = "^3.4.9"
-argo-client = "0.0.7"
+#argo-client = "0.0.8"
+argo-client = { path = "../../deps/argo/python/", develop = true }
 
 [tool.poetry.dev-dependencies]
 mypy = "^0.812"

diff --git a/cryptol-remote-api/python/tests/cryptol/test_CplxQNewtype.py b/cryptol-remote-api/python/tests/cryptol/test_CplxQNewtype.py
@@ -7,7 +7,7 @@
 
 class TestCplxQ(unittest.TestCase):
     def test_CplxQ(self):
-        c = cryptol.connect(reset_server=True, verify=False)
+        c = cryptol.connect(verify=False)
         c.load_file(str(Path('tests','cryptol','test-files', 'CplxQNewtype.cry')))
 
         forty_two = c.eval("fortyTwo").result()

diff --git a/cryptol-remote-api/python/tests/cryptol_eval/test_basics.py b/cryptol-remote-api/python/tests/cryptol_eval/test_basics.py
@@ -102,10 +102,10 @@ def test_reset_with_many_usages_many_connections(self):
             self.assertEqual(res, [BV(size=8,value=0xff), BV(size=8,value=0xff)])
             c.reset()
 
-    def test_reset_server_with_many_usages_many_connections(self):
+    def test_server_with_many_usages_many_connections(self):
         for i in range(0,100):
             time.sleep(.05)
-            c = cryptol.connect(url=self.url, reset_server=True)
+            c = cryptol.connect(url=self.url)
             res = c.call('f', BV(size=8,value=0xff)).result()
             self.assertEqual(res, [BV(size=8,value=0xff), BV(size=8,value=0xff)])
 

diff --git a/deps/argo b/deps/argo
+144 −56		argo/src/Argo.hs
+15 −2		argo/src/Argo/DefaultMain.hs
+44 −5		argo/src/Argo/ServerState.hs
+2 −1		file-echo-api/file-echo-api/Main.hs
+1 −1		file-echo-api/mutable-file-echo-api/Main.hs
+23 −7		file-echo-api/src/FileEchoServer.hs
+5 −0		python/CHANGELOG.md
+6 −0		python/argo_client/connection.py
+1 −1		python/setup.py
+104 −26		python/tests/test_file_echo_api.py
+3 −3		python/tests/test_mutable_file_echo_api.py