fluencelabs/wasm-utils
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-utils synced 2025-03-15 11:10:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113 from holygits/fix/preserve-optimize

Browse Source 
Preserve deploy symbol on optimize for substrate target
This commit is contained in:
Nikolay Volf 2019-01-24 11:15:30 +03:00 committed by GitHub
commit 6046e94b40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/build.rs
View File

@ -96,10 +96,7 @@ pub fn build(
let mut public_api_entries = public_api_entries.to_vec();
public_api_entries.push(target_runtime.symbols().call);
if !skip_optimization {
optimize(
&mut module,
public_api_entries,
)?;
optimize(&mut module, public_api_entries)?;
}
if !has_ctor(&ctor_module, target_runtime) {
@ -107,7 +104,11 @@ pub fn build(
}
if !skip_optimization {
optimize(&mut ctor_module, vec![target_runtime.symbols().create])?;
let preserved_exports = match target_runtime {
TargetRuntime::PWasm(_) => vec![target_runtime.symbols().call],
TargetRuntime::Substrate(_) => vec![target_runtime.symbols().call, target_runtime.symbols().create],
};
optimize(&mut ctor_module, preserved_exports)?;
}
if let TargetRuntime::PWasm(_) = target_runtime {

2
src/pack.rs
View File

@ -41,7 +41,7 @@ impl fmt::Display for Error {
}
}
/// If module has an exported function matching "create" symbol we want to pack it into "constructor".
/// If a pwasm module has an exported function matching "create" symbol we want to pack it into "constructor".
/// `raw_module` is the actual contract code
/// `ctor_module` is the constructor which should return `raw_module`
pub fn pack_instance(raw_module: Vec<u8>, mut ctor_module: elements::Module, target: &TargetRuntime) -> Result<elements::Module, Error> {