Skip to content

Commit

Permalink
Merge #296
Browse files Browse the repository at this point in the history
296: Keep in sync with massa-proto-rs version used in massa r=bilboquet a=bilboquet



Co-authored-by: Jean-François Morcillo <[email protected]>
  • Loading branch information
bors[bot] and Jean-François Morcillo authored Aug 4, 2023
2 parents 9dcef69 + 94d9e20 commit 9f71115
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 50 deletions.
83 changes: 43 additions & 40 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ chrono = { version = "=0.4", features = ["clock"], default-features = false }
displaydoc = "0.2"
function_name = "0.3"
loupe = "0.1"
massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs.git", rev = "32179e2" }
massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs.git", rev = "eaa5ad3" }
more-asserts = "0.3"
num_enum = "0.6.1"
parking_lot = "0.12"
Expand Down
15 changes: 6 additions & 9 deletions src/execution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,12 @@ pub(crate) fn exec(
RuntimeModule::ASModule(module) => exec_as_module(
interface, module, function, param, limit, gas_costs,
)?,
RuntimeModule::WasmV1Module(module) => {
let res = exec_wasmv1_module(
interface, module, function, param, limit, gas_costs,
)
.map_err(|err| {
anyhow!("Failed to execute WasmV1 module: {}", err.to_string())
})?;
res
}
RuntimeModule::WasmV1Module(module) => exec_wasmv1_module(
interface, module, function, param, limit, gas_costs,
)
.map_err(|err| {
anyhow!("Failed to execute WasmV1 module: {}", err.to_string())
})?,
};
Ok(response)
}
Expand Down

0 comments on commit 9f71115

Please sign in to comment.