Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Bump wasmtime again #5950

Merged
merged 3 commits into from
May 8, 2020
Merged

Bump wasmtime again #5950

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48d2704
Update wasmtime (#5822)
NikVolf May 4, 2020
32e57b9
Bump version
arkpar May 7, 2020
fd55de9
Added parallel execution test
arkpar May 8, 2020
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
Next Next commit
Update wasmtime (#5822) 
* update wasmtime

* update tests

* Update client/executor/wasmtime/src/host.rs

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* wip

* use master-candidate

* update with patches

* update versions

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
  • Loading branch information
@NikVolf @bkchr @arkpar
2 people authored and arkpar committed May 7, 2020
commit 48d27045e4076585534495e56336c7d9ee2ea2af
142 changes: 77 additions & 65 deletions Cargo.lock
View file
Open in desktop

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

10 changes: 4 additions & 6 deletions client/executor/src/integration_tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@ fn call_not_existing_function(wasm_method: WasmExecutionMethod) {
"\"Trap: Trap { kind: Host(Other(\\\"Function `missing_external` is only a stub. Calling a stub is not allowed.\\\")) }\""
),
#[cfg(feature = "wasmtime")]
WasmExecutionMethod::Compiled => assert_eq!(
&format!("{:?}", e),
"\"Wasm execution trapped: call to a missing function env:missing_external\""
WasmExecutionMethod::Compiled => assert!(
format!("{:?}", e).contains("Wasm execution trapped: call to a missing function env:missing_external")
),
}
}
Expand All @@ -121,9 +120,8 @@ fn call_yet_another_not_existing_function(wasm_method: WasmExecutionMethod) {
"\"Trap: Trap { kind: Host(Other(\\\"Function `yet_another_missing_external` is only a stub. Calling a stub is not allowed.\\\")) }\""
),
#[cfg(feature = "wasmtime")]
WasmExecutionMethod::Compiled => assert_eq!(
&format!("{:?}", e),
"\"Wasm execution trapped: call to a missing function env:yet_another_missing_external\""
WasmExecutionMethod::Compiled => assert!(
format!("{:?}", e).contains("Wasm execution trapped: call to a missing function env:yet_another_missing_external")
),
}
}
Expand Down
10 changes: 5 additions & 5 deletions client/executor/wasmtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ sp-wasm-interface = { version = "2.0.0-dev", path = "../../../primitives/wasm-in
sp-runtime-interface = { version = "2.0.0-dev", path = "../../../primitives/runtime-interface" }
sp-core = { version = "2.0.0-dev", path = "../../../primitives/core" }
sp-allocator = { version = "2.0.0-dev", path = "../../../primitives/allocator" }
wasmtime = { package = "substrate-wasmtime", version = "0.13.0-threadsafe.1" }
wasmtime_runtime = { package = "substrate-wasmtime-runtime", version = "0.13.0-threadsafe.1" }
wasmtime-environ = "0.12.0"
cranelift-wasm = "0.59.0"
cranelift-codegen = "0.59.0"
wasmtime = { package = "substrate-wasmtime", version = "0.16.0-threadsafe.1" }
wasmtime-runtime = { package = "substrate-wasmtime-runtime", version = "0.16.0-threadsafe.1" }
wasmtime-environ = "0.16"
cranelift-wasm = "0.63"
cranelift-codegen = "0.63"

[dev-dependencies]
assert_matches = "1.3.0"
Loading