Skip to content

Update .wasm files for testing and adjust vm tests #1654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 5, 2023
Merged

Update .wasm files for testing and adjust vm tests #1654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ccb10c
Bump optimizer to 0.12.13
webmaster128 Apr 4, 2023
2ca2ba4
Rename test contracts to 1_2.wasm and add missing abort import
webmaster128 Apr 4, 2023
0cfeac7
Recompile testdata .wasm files for vm tests and adjust tests
webmaster128 Apr 5, 2023
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ jobs:
name: Build development contracts
command: |
echo "Building all contracts under ./contracts"
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.12.11 ./contracts/*/
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.12.13 ./contracts/*/
- run:
name: Check development contracts
command: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ but the quickstart guide is:
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11
cosmwasm/rust-optimizer:0.12.13
```

It will output a highly size-optimized build as `contract.wasm` in `$CODE`. With
Expand Down
20 changes: 10 additions & 10 deletions contracts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,52 +53,52 @@ reason, use the following commands:
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_burner",target=/code/contracts/burner/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/burner
cosmwasm/rust-optimizer:0.12.13 ./contracts/burner

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_crypto_verify",target=/code/contracts/crypto-verify/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/crypto-verify
cosmwasm/rust-optimizer:0.12.13 ./contracts/crypto-verify

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_floaty",target=/code/contracts/floaty/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/floaty
cosmwasm/rust-optimizer:0.12.13 ./contracts/floaty

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_hackatom",target=/code/contracts/hackatom/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/hackatom
cosmwasm/rust-optimizer:0.12.13 ./contracts/hackatom

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_ibc_reflect",target=/code/contracts/ibc-reflect/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/ibc-reflect
cosmwasm/rust-optimizer:0.12.13 ./contracts/ibc-reflect

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_ibc_reflect_send",target=/code/contracts/ibc-reflect-send/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/ibc-reflect-send
cosmwasm/rust-optimizer:0.12.13 ./contracts/ibc-reflect-send

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_queue",target=/code/contracts/queue/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/queue
cosmwasm/rust-optimizer:0.12.13 ./contracts/queue

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_reflect",target=/code/contracts/reflect/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/reflect
cosmwasm/rust-optimizer:0.12.13 ./contracts/reflect

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_staking",target=/code/contracts/staking/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/staking
cosmwasm/rust-optimizer:0.12.13 ./contracts/staking

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_virus",target=/code/contracts/virus/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/virus
cosmwasm/rust-optimizer:0.12.13 ./contracts/virus
```

## Entry points
Expand Down
14 changes: 7 additions & 7 deletions packages/vm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,26 @@ To rebuild the test contracts, go to the repo root and do
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_cyberpunk",target=/code/contracts/cyberpunk/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/cyberpunk \
cosmwasm/rust-optimizer:0.12.13 ./contracts/cyberpunk \
&& cp artifacts/cyberpunk.wasm packages/vm/testdata/cyberpunk.wasm

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_hackatom",target=/code/contracts/hackatom/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/hackatom \
&& cp artifacts/hackatom.wasm packages/vm/testdata/hackatom_1.0.wasm
cosmwasm/rust-optimizer:0.12.13 ./contracts/hackatom \
&& cp artifacts/hackatom.wasm packages/vm/testdata/hackatom_1.2.wasm

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_ibc_reflect",target=/code/contracts/ibc-reflect/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/ibc-reflect \
&& cp artifacts/ibc_reflect.wasm packages/vm/testdata/ibc_reflect_1.0.wasm
cosmwasm/rust-optimizer:0.12.13 ./contracts/ibc-reflect \
&& cp artifacts/ibc_reflect.wasm packages/vm/testdata/ibc_reflect_1.2.wasm

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_floaty",target=/code/contracts/floaty/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11 ./contracts/floaty \
&& cp artifacts/floaty.wasm packages/vm/testdata/floaty_1.0.wasm
cosmwasm/rust-optimizer:0.12.13 ./contracts/floaty \
&& cp artifacts/floaty.wasm packages/vm/testdata/floaty_1.2.wasm
```

## Testing
Expand Down
3 changes: 1 addition & 2 deletions packages/vm/src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,9 +1102,8 @@ mod tests {
report2,
AnalysisReport {
has_ibc_entry_points: true,
required_capabilities: HashSet::from_iter(vec![
required_capabilities: HashSet::from_iter([
"iterator".to_string(),
"staking".to_string(),
"stargate".to_string()
]),
}
Expand Down
1 change: 1 addition & 0 deletions packages/vm/src/environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ mod tests {
"ed25519_verify" => Function::new_native(store, |_a: u32, _b: u32, _c: u32| -> u32 { 0 }),
"ed25519_batch_verify" => Function::new_native(store, |_a: u32, _b: u32, _c: u32| -> u32 { 0 }),
"debug" => Function::new_native(store, |_a: u32| {}),
"abort" => Function::new_native(store, |_a: u32| {}),
},
};
let instance = Box::from(WasmerInstance::new(&module, &import_obj).unwrap());
Expand Down
1 change: 1 addition & 0 deletions packages/vm/src/imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ mod tests {
"ed25519_verify" => Function::new_native(store, |_a: u32, _b: u32, _c: u32| -> u32 { 0 }),
"ed25519_batch_verify" => Function::new_native(store, |_a: u32, _b: u32, _c: u32| -> u32 { 0 }),
"debug" => Function::new_native(store, |_a: u32| {}),
"abort" => Function::new_native(store, |_a: u32| {}),
},
};
let instance = Box::from(WasmerInstance::new(&module, &import_obj).unwrap());
Expand Down
8 changes: 4 additions & 4 deletions packages/vm/src/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ mod tests {

let report2 = instance.create_gas_report();
assert_eq!(report2.used_externally, 73);
assert_eq!(report2.used_internally, 5775750198);
assert_eq!(report2.used_internally, 5764950198);
assert_eq!(report2.limit, LIMIT);
assert_eq!(
report2.remaining,
Expand Down Expand Up @@ -897,7 +897,7 @@ mod tests {
.unwrap();

let init_used = orig_gas - instance.get_gas_left();
assert_eq!(init_used, 5775750271);
assert_eq!(init_used, 5764950271);
}

#[test]
Expand All @@ -920,7 +920,7 @@ mod tests {
.unwrap();

let execute_used = gas_before_execute - instance.get_gas_left();
assert_eq!(execute_used, 8627053606);
assert_eq!(execute_used, 8548903606);
}

#[test]
Expand Down Expand Up @@ -954,6 +954,6 @@ mod tests {
assert_eq!(answer.as_slice(), b"{\"verifier\":\"verifies\"}");

let query_used = gas_before_query - instance.get_gas_left();
assert_eq!(query_used, 4438350006);
assert_eq!(query_used, 4493700006);
}
}
Binary file modified packages/vm/testdata/cyberpunk.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/vm/testdata/floaty.wasm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
floaty_1.0.wasm
floaty_1.2.wasm
Binary file added packages/vm/testdata/floaty_1.2.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/vm/testdata/hackatom.wasm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
hackatom_1.0.wasm
hackatom_1.2.wasm
Binary file added packages/vm/testdata/hackatom_1.2.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/vm/testdata/ibc_reflect.wasm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ibc_reflect_1.0.wasm
ibc_reflect_1.2.wasm
Binary file added packages/vm/testdata/ibc_reflect_1.2.wasm
View file
Open in desktop
Binary file not shown.