Skip to content

Commit

Permalink
Try #261:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] committed Jun 27, 2023
2 parents 04c4620 + 0d0229f commit 88dadb1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
Expand Down
5 changes: 3 additions & 2 deletions src/as_execution/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<u64, _>(exhausted) if exhausted > 0 => return Ok(0),
Ok::<u64, _>(_) => (),
// Using i32 here because it's the type used internally by wasmer for exhausted.
Ok::<i32, _>(exhausted) if exhausted > 0 => return Ok(0),
Ok::<i32, _>(_) => (),
Err(_) => abi_bail!("exhausted_points has wrong type"),
},
None => abi_bail!("Lost reference to exhausted_points"),
Expand Down

0 comments on commit 88dadb1

Please sign in to comment.