From 3fd7f3cbe98179641bfe2eb6b4b4e0b9e23757fd Mon Sep 17 00:00:00 2001 From: Tarrence van As Date: Wed, 10 Jan 2024 19:22:31 -0500 Subject: [PATCH] Update devcontainer image hash: 136a67a (#1412) --- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci.yml | 18 ++++---- .github/workflows/release-dispatch.yml | 2 +- .github/workflows/release.yml | 2 +- .../core/src/service/messaging/starknet.rs | 4 +- crates/katana/storage/provider/tests/block.rs | 42 +++++++++---------- rust-toolchain.toml | 2 +- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 08adc14f5d..6d4d5427a7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust { "name": "Rust", - "image": "ghcr.io/dojoengine/dojo-dev:448ffda", + "image": "ghcr.io/dojoengine/dojo-dev:136a67a", "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5042e6ebd..4ff6eac5fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,13 +8,13 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: 1.70.0 + RUST_VERSION: 1.74.0 jobs: test: runs-on: ubuntu-latest-16-cores container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -28,7 +28,7 @@ jobs: ensure-wasm: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -61,7 +61,7 @@ jobs: dojo-core-test: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -70,7 +70,7 @@ jobs: dojo-spawn-and-move-example-test: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -79,7 +79,7 @@ jobs: dojo-world-bindings-check: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -88,7 +88,7 @@ jobs: clippy: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -97,7 +97,7 @@ jobs: fmt: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -106,7 +106,7 @@ jobs: docs: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml index 1306b4c466..ca672d9de2 100644 --- a/.github/workflows/release-dispatch.yml +++ b/.github/workflows/release-dispatch.yml @@ -14,7 +14,7 @@ jobs: contents: write runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: # Workaround described here: https://github.com/actions/checkout/issues/760 - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1212b3094c..5fd3f3870b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: 1.70.0 + RUST_VERSION: 1.74.0 REGISTRY_IMAGE: ghcr.io/${{ github.repository }} jobs: diff --git a/crates/katana/core/src/service/messaging/starknet.rs b/crates/katana/core/src/service/messaging/starknet.rs index 2b7d2d3d8e..642f0de240 100644 --- a/crates/katana/core/src/service/messaging/starknet.rs +++ b/crates/katana/core/src/service/messaging/starknet.rs @@ -488,7 +488,7 @@ mod tests { let to_address = selector!("to_address"); let selector = selector!("selector"); let nonce = FieldElement::ONE; - let calldata = vec![from_address, FieldElement::THREE]; + let calldata = [from_address, FieldElement::THREE]; let transaction_hash = FieldElement::ZERO; let event = EmittedEvent { @@ -522,7 +522,7 @@ mod tests { let _to_address = selector!("to_address"); let _selector = selector!("selector"); let _nonce = FieldElement::ONE; - let _calldata = vec![from_address, FieldElement::THREE]; + let _calldata = [from_address, FieldElement::THREE]; let transaction_hash = FieldElement::ZERO; let event = EmittedEvent { diff --git a/crates/katana/storage/provider/tests/block.rs b/crates/katana/storage/provider/tests/block.rs index 1886b7caac..1128d89378 100644 --- a/crates/katana/storage/provider/tests/block.rs +++ b/crates/katana/storage/provider/tests/block.rs @@ -26,14 +26,6 @@ use fixtures::{ }; use utils::generate_dummy_blocks_and_receipts; -#[template] -#[rstest::rstest] -#[case::insert_1_block(1)] -#[case::insert_2_block(2)] -#[case::insert_5_block(5)] -#[case::insert_10_block(10)] -fn insert_block_cases(#[case] block_count: u64) {} - #[apply(insert_block_cases)] fn insert_block_with_in_memory_provider( #[from(in_memory_provider)] provider: BlockchainProvider, @@ -139,19 +131,6 @@ where Ok(()) } -#[template] -#[rstest::rstest] -#[case::state_update_at_block_1(1, mock_state_updates()[0].clone())] -#[case::state_update_at_block_2(2, mock_state_updates()[1].clone())] -#[case::state_update_at_block_3(3, StateUpdatesWithDeclaredClasses::default())] -#[case::state_update_at_block_5(5, mock_state_updates()[2].clone())] -fn test_read_state_update( - #[from(provider_with_states)] provider: BlockchainProvider, - #[case] block_num: BlockNumber, - #[case] expected_state_update: StateUpdatesWithDeclaredClasses, -) { -} - #[apply(test_read_state_update)] fn test_read_state_update_with_in_memory_provider( #[with(in_memory_provider())] provider: BlockchainProvider, @@ -193,3 +172,24 @@ where assert_eq!(actual_state_update, Some(expected_state_update.state_updates)); Ok(()) } + +#[template] +#[rstest::rstest] +#[case::insert_1_block(1)] +#[case::insert_2_block(2)] +#[case::insert_5_block(5)] +#[case::insert_10_block(10)] +fn insert_block_cases(#[case] block_count: u64) {} + +#[template] +#[rstest::rstest] +#[case::state_update_at_block_1(1, mock_state_updates()[0].clone())] +#[case::state_update_at_block_2(2, mock_state_updates()[1].clone())] +#[case::state_update_at_block_3(3, StateUpdatesWithDeclaredClasses::default())] +#[case::state_update_at_block_5(5, mock_state_updates()[2].clone())] +fn test_read_state_update( + #[from(provider_with_states)] provider: BlockchainProvider, + #[case] block_num: BlockNumber, + #[case] expected_state_update: StateUpdatesWithDeclaredClasses, +) { +} diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 22048ac5bb..639f4f17d9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.70.0" +channel = "1.74.0"