Skip to content
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.

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

fix: hardcoded test failing in the CI #448

Merged
merged 4 commits into from
Mar 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 16 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ toml_edit = { version = "0.22", features = ["serde"] }
symlink = "0.1"
serde_json = { version = "1.0", features = ["preserve_order"] }
serde = { version = "1.0", features = ["derive"] }
zombienet-sdk = "0.2.25"
zombienet-sdk = "0.2.26"
git2_credentials = "0.13.0"

# pop-cli
Expand Down
1 change: 0 additions & 1 deletion crates/pop-parachains/src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
["cumulus-client-collator", "cumulus-primitives-core", "parachains-common", "polkadot-sdk"];
Ok(DEPENDENCIES.into_iter().any(|d| {
manifest.dependencies.contains_key(d) ||
manifest.workspace.as_ref().map_or(false, |w| w.dependencies.contains_key(d))

Check warning on line 55 in crates/pop-parachains/src/build.rs

View workflow job for this annotation

GitHub Actions / clippy

this `map_or` can be simplified

warning: this `map_or` can be simplified --> crates/pop-parachains/src/build.rs:55:4 | 55 | manifest.workspace.as_ref().map_or(false, |w| w.dependencies.contains_key(d)) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use is_some_and instead: `manifest.workspace.as_ref().is_some_and(|w| w.dependencies.contains_key(d))` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_map_or = note: `#[warn(clippy::unnecessary_map_or)]` on by default
}))
}

Expand Down Expand Up @@ -515,7 +515,6 @@
assert!(raw_chain_spec.exists());
let content = fs::read_to_string(raw_chain_spec.clone()).expect("Could not read file");
assert!(content.contains("\"para_id\": 2001"));
assert!(content.contains("\"id\": \"pop-devnet\""));
assert!(content.contains("\"bootNodes\": []"));
// Test export wasm file
let wasm_file = export_wasm_file(&binary_path, &raw_chain_spec, "para-2001-wasm")?;
Expand Down
2 changes: 2 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ ignore = [
{ id = "RUSTSEC-2024-0388", reason = "No upgrade available. Tracking the vulnerability: https://github.com/r0gue-io/pop-cli/issues/436" },
{ id = "RUSTSEC-2024-0384", reason = "No upgrade available. Tracking the vulnerability: https://github.com/r0gue-io/pop-cli/issues/437" },
{ id = "RUSTSEC-2020-0163", reason = "No upgrade available. Tracking the vulnerability: https://github.com/r0gue-io/pop-cli/issues/438" },
{ id = "RUSTSEC-2024-0436", reason = "No upgrade available. Tracking the vulnerability: https://github.com/r0gue-io/pop-cli/issues/450" },
{ id = "RUSTSEC-2025-0012", reason = "No upgrade available. Tracking the vulnerability: https://github.com/r0gue-io/pop-cli/issues/451" }
]

[licenses]
Expand Down
Loading