From e0aa36e4c8b1bfe34d13b754c882928d4346262c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Morcillo?= Date: Thu, 22 Jun 2023 16:49:23 +0200 Subject: [PATCH 1/3] Fix CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-François Morcillo --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee56e3fd..8d8cce6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,6 +134,10 @@ jobs: profile: minimal toolchain: nightly override: true + - uses: arduino/setup-protoc@v1 + with: + version: '3.x' + repo-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions-rs/cargo@v1 with: command: clean From 1f4a79406c51ba556765cc6984ede9eb447c2186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Morcillo?= Date: Thu, 22 Jun 2023 17:08:44 +0200 Subject: [PATCH 2/3] Don't generate unused documentation that has to be replaced soon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-François Morcillo --- build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.rs b/build.rs index ff8dbb61..5aa61fb1 100644 --- a/build.rs +++ b/build.rs @@ -25,7 +25,7 @@ mod tonic { .map_err(|e| format!("protobuf compilation error: {:?}", e))?; // Generate documentation for the protobuf abi - generate_doc(&protos).map_err(|e| format!("protobuf documentation error: {:?}", e))?; + // generate_doc(&protos).map_err(|e| format!("protobuf documentation error: {:?}", e))?; // Return Ok if the build and documentation generation were successful Ok(()) From 0d0229fe75894369aa2ddb1cfcbdca0ebd461c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Morcillo?= Date: Mon, 26 Jun 2023 18:43:57 +0200 Subject: [PATCH 3/3] Fix test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-François Morcillo --- src/as_execution/env.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/as_execution/env.rs b/src/as_execution/env.rs index a7181a1a..3654e518 100644 --- a/src/as_execution/env.rs +++ b/src/as_execution/env.rs @@ -92,8 +92,9 @@ pub(crate) fn get_remaining_points( } else { match env.get_exhausted_points().as_ref() { Some(exhausted_points) => match exhausted_points.get(store).try_into() { - Ok::(exhausted) if exhausted > 0 => return Ok(0), - Ok::(_) => (), + // Using i32 here because it's the type used internally by wasmer for exhausted. + Ok::(exhausted) if exhausted > 0 => return Ok(0), + Ok::(_) => (), Err(_) => abi_bail!("exhausted_points has wrong type"), }, None => abi_bail!("Lost reference to exhausted_points"),