Skip to content

Commit

Permalink
[v4.x.x] fix E2E tests for newer rust toolchain & contracts node (u…
Browse files Browse the repository at this point in the history
…se-ink#1884)

* Manual backport of use-ink#1883: Use `contract-build` `3.2.0`

* ink-e2e Test Failures in substrate-contracts-node (v0.27.0) due to Unsupported --ws-port Argument (use-ink#1850)

* Update ink-e2e to the latest substrate-contracts-node

* Apply rust-fmt

* Change logging, to be up-to-date with master branch

* Apply rustfmt-nightly

(cherry picked from commit 6d7810e)

* Remove --ws-port arg

* Update substrate deps

* Manual backports of use-ink#1795 and use-ink#1855 to update subxt

* Update subxt in example

* Backport: fix e2e test, account for contract initial free balance (use-ink#1777)

* Use latest CI image

* 🦖 fix spellcheck for new version, add words to dict (use-ink#1836)

* Fix call-runtime tests

* enable call-runtime tests

* ui tests

* `[ink_e2e]` update `Determinism` enum to match Substrate definition (use-ink#1781)

* `[ink_e2e]` update `Determinism` enum to match Substrate definition

* fmt

* Fix multi_contract_caller example for new deposit behaviour

* Reenable examples-test step

* Fix integration test

* Remove riscv +stable

* Fix riscv build

---------

Co-authored-by: Bohdan Ohorodnii <35969035+varex83@users.noreply.github.com>
  • Loading branch information
2 people authored and goastler committed Aug 31, 2023
1 parent bc3d921 commit e0d61f8
Show file tree
Hide file tree
Showing 16 changed files with 383 additions and 94 deletions.
4 changes: 1 addition & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ variables:
GIT_DEPTH: 100
CARGO_INCREMENTAL: 0
CARGO_TARGET_DIR: "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
# CI_IMAGE is changed to "-:staging" when the CI image gets rebuilt
# read more https://github.com/paritytech/scripts/pull/244
CI_IMAGE: "paritytech/ink-ci-linux:a1f03f4b-20230420"
CI_IMAGE: "paritytech/ci-unified:bullseye-1.71.0-2023-05-23"
PURELY_STD_CRATES: "ink/codegen metadata engine e2e e2e/macro ink/ir"
ALSO_WASM_CRATES: "env storage storage/traits allocator prelude primitives ink ink/macro"
ALL_CRATES: "${PURELY_STD_CRATES} ${ALSO_WASM_CRATES}"
Expand Down
32 changes: 16 additions & 16 deletions crates/e2e/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ ink = { version = "4.2.1", path = "../ink" }
ink_env = { version = "4.2.1", path = "../env" }
ink_primitives = { version = "4.2.1", path = "../primitives" }

funty = { workspace = true }
impl-serde = { workspace = true }
jsonrpsee = { workspace = true, features = ["ws-client"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread"] }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
scale = { package = "parity-scale-codec", workspace = true }
subxt = { workspace = true }
subxt-signer = { workspace = true, features = ["subxt", "sr25519"] }
funty = "2.0.0"
impl-serde = { version = "0.3.1", default-features = false }
jsonrpsee = { version = "0.17.0", features = ["ws-client"] }
serde = { version = "1.0.137", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.81" }
tokio = { version = "1.18.2", features = ["rt-multi-thread"] }
log = { version = "0.4" }
env_logger = { version = "0.10" }
scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] }
subxt = "0.31.0"
subxt-signer = { version = "0.31.0", features = ["subxt", "sr25519"] }

# Substrate
pallet-contracts-primitives = { workspace = true }
sp-core = { workspace = true }
sp-keyring = { workspace = true }
sp-runtime = { workspace = true }
sp-weights = { workspace = true }
pallet-contracts-primitives = "24.0.0"
sp-core = "21.0.0"
sp-keyring = "24.0.0"
sp-runtime = "24.0.0"
sp-weights = "20.0.0"

[dev-dependencies]
# Required for the doctest of `MessageBuilder::call`
Expand Down
2 changes: 1 addition & 1 deletion crates/e2e/macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ proc-macro = true
[dependencies]
ink_ir = { version = "4.2.1", path = "../../ink/ir" }
cargo_metadata = "0.15.3"
contract-build = "2.0.2"
contract-build = "3.2.0"
derive_more = "0.99.17"
env_logger = "0.10.0"
log = "0.4.17"
Expand Down
1 change: 0 additions & 1 deletion crates/e2e/macro/src/codegen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ fn build_contract(path_to_cargo_toml: &str) -> String {
output_type: OutputType::HumanReadable,
skip_wasm_validation: false,
target: Target::Wasm,
..ExecuteArgs::default()
};

match contract_build::execute(args) {
Expand Down
Loading

0 comments on commit e0d61f8

Please sign in to comment.