From e1803bbd77598b25927d0f0219def8e9777c353d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Chabowski?= <88321181+rafal-ch@users.noreply.github.com> Date: Thu, 30 May 2024 16:03:49 +0200 Subject: [PATCH] Disable integer sign extensions (#139) * Update to recent (post 1.69) nightly * Build without LLVM sign extensions * Satisfy clippy --- Makefile | 11 +++++++---- rust-toolchain | 2 +- tests/src/utility/installer_request_builders.rs | 6 ++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0a3648f..9c957f2 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,15 @@ prepare: rustup target add wasm32-unknown-unknown + rustup component add clippy --toolchain ${PINNED_TOOLCHAIN} + rustup component add rustfmt --toolchain ${PINNED_TOOLCHAIN} + rustup component add rust-src --toolchain ${PINNED_TOOLCHAIN} .PHONY: build-contract build-contract: - cd cep18 && cargo build --release --target wasm32-unknown-unknown - cd cep18-test-contract && cargo build --release --target wasm32-unknown-unknown - wasm-strip ./cep18/target/wasm32-unknown-unknown/release/cep18.wasm - wasm-strip ./cep18-test-contract/target/wasm32-unknown-unknown/release/cep18_test_contract.wasm + RUSTFLAGS="-C target-cpu=mvp" cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -p cep18 + RUSTFLAGS="-C target-cpu=mvp" cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -p cep18-test-contract + wasm-strip target/wasm32-unknown-unknown/release/cep18.wasm + wasm-strip target/wasm32-unknown-unknown/release/cep18_test_contract.wasm setup-test: build-contract mkdir -p tests/wasm diff --git a/rust-toolchain b/rust-toolchain index f9e5e5e..579ba54 100755 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-03-25 +nightly-2024-05-28 diff --git a/tests/src/utility/installer_request_builders.rs b/tests/src/utility/installer_request_builders.rs index 85eec35..122c9d6 100644 --- a/tests/src/utility/installer_request_builders.rs +++ b/tests/src/utility/installer_request_builders.rs @@ -149,9 +149,15 @@ pub(crate) fn get_test_result( .get_package(cep18_test_contract_package) .expect("should have contract package"); let enabled_versions = contract_package.enabled_versions(); +<<<<<<< HEAD let contract_hash = enabled_versions .contract_hashes() .last() +======= + let (_version, contract_hash) = enabled_versions + .iter() + .next_back() +>>>>>>> d6348eb (Disable integer sign extensions (#139)) .expect("should have latest version"); let entity_addr = EntityAddr::new_smart_contract(contract_hash.value()); builder.get_value(entity_addr, RESULT_KEY)